corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1108721, HTMLMediaElement.textTracks needs to be nullable in Gecko for now, r=peterv

Browse Source
This commit is contained in:
Olli Pettay
2015-01-12 13:07:38 +02:00
parent 7e2fc5d8a7
commit dd023be2aa
6 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dom/html/TextTrackManager.cpp
View File

@@ -91,13 +91,12 @@ TextTrackManager::TextTrackManager(HTMLMediaElement *aMediaElement)
: mMediaElement(aMediaElement)
, performedTrackSelection(false)
{
bool hasHadScriptObject = true;
nsIScriptGlobalObject* scriptObject =
mMediaElement->OwnerDoc()->GetScriptHandlingObject(hasHadScriptObject);
nsISupports* parentObject =
mMediaElement->OwnerDoc()->GetParentObject();
NS_ENSURE_TRUE_VOID(scriptObject || !hasHadScriptObject);
NS_ENSURE_TRUE_VOID(parentObject);
nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(scriptObject);
nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(parentObject);
mNewCues = new TextTrackCueList(window);
mTextTracks = new TextTrackList(window, this);
mPendingTextTracks = new TextTrackList(window, this);
@@ -115,7 +114,7 @@ TextTrackManager::~TextTrackManager()
}
TextTrackList*
TextTrackManager::TextTracks() const
TextTrackManager::GetTextTracks() const
{
return mTextTracks;
}