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

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

View File

@@ -153,13 +153,12 @@ HTMLTrackElement::CreateTextTrack()
kind = TextTrackKind::Subtitles;
}
bool hasHadScriptObject = true;
nsIScriptGlobalObject* scriptObject =
OwnerDoc()->GetScriptHandlingObject(hasHadScriptObject);
nsISupports* parentObject =
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);
mTrack = new TextTrack(window, kind, label, srcLang,
TextTrackMode::Disabled,
TextTrackReadyState::NotLoaded,