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

Backed out changeset f2508a6e4c53 (bug 1636572) for causing wpt failures in track-element/cors/*

Browse Source 
CLOSED TREE
This commit is contained in:
Mihai Alexandru Michis
2020-05-11 10:47:22 +03:00
parent 68db6f1413
commit 0f0d369025
3 changed files with 21 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
dom/html/HTMLTrackElement.cpp
View File

@@ -116,7 +116,7 @@ NS_IMPL_ISUPPORTS(WindowDestroyObserver, nsIObserver);
HTMLTrackElement::HTMLTrackElement(
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo)
: nsGenericHTMLElement(std::move(aNodeInfo)),
mIsLoadingResource(false),
mLoadResourceDispatched(false),
mWindowDestroyObserver(nullptr) {
nsISupports* parentObject = OwnerDoc()->GetParentObject();
NS_ENSURE_TRUE_VOID(parentObject);
@@ -230,8 +230,6 @@ void HTMLTrackElement::SetSrc(const nsAString& aSrc, ErrorResult& aError) {
mChannel->Cancel(NS_BINDING_ABORTED);
mChannel = nullptr;
}
// Reset the flag to ensure we can start a new load.
mIsLoadingResource = false;
MaybeDispatchLoadResource();
}
@@ -252,13 +250,6 @@ void HTMLTrackElement::MaybeClearAllCues() {
void HTMLTrackElement::MaybeDispatchLoadResource() {
MOZ_ASSERT(mTrack, "Should have already created text track!");
// step1, if another occurrence of this algorithm is already running for this
// text track and its track element, return, letting that other algorithm take
// care of this element.
if (mIsLoadingResource) {
return;
}
// step2, if the text track's text track mode is not set to one of hidden or
// showing, then return.
if (mTrack->Mode() == TextTrackMode::Disabled) {
@@ -279,16 +270,19 @@ void HTMLTrackElement::MaybeDispatchLoadResource() {
}
// step5, await a stable state and run the rest of steps.
RefPtr<WebVTTListener> listener = new WebVTTListener(this);
RefPtr<Runnable> r = NewRunnableMethod<RefPtr<WebVTTListener>>(
"dom::HTMLTrackElement::LoadResource", this,
&HTMLTrackElement::LoadResource, std::move(listener));
nsContentUtils::RunInStableState(r.forget());
mIsLoadingResource = true;
if (!mLoadResourceDispatched) {
RefPtr<WebVTTListener> listener = new WebVTTListener(this);
RefPtr<Runnable> r = NewRunnableMethod<RefPtr<WebVTTListener>>(
"dom::HTMLTrackElement::LoadResource", this,
&HTMLTrackElement::LoadResource, std::move(listener));
nsContentUtils::RunInStableState(r.forget());
mLoadResourceDispatched = true;
}
}
void HTMLTrackElement::LoadResource(RefPtr<WebVTTListener>&& aWebVTTListener) {
LOG("LoadResource");
mLoadResourceDispatched = false;
nsAutoString src;
if (!GetAttr(kNameSpaceID_None, nsGkAtoms::src, src) || src.IsEmpty()) {
@@ -517,20 +511,5 @@ void HTMLTrackElement::DispatchTestEvent(const nsAString& aName) {
DispatchTrustedEvent(aName);
}
void HTMLTrackElement::LoadResourceEnd(nsresult aStatus) {
if (NS_FAILED(aStatus)) {
LOG("Load failed");
return SetReadyState(TextTrackReadyState::FailedToLoad);
}
if (ReadyState() == TextTrackReadyState::FailedToLoad) {
return;
}
SetReadyState(TextTrackReadyState::Loaded);
CancelChannelAndListener();
mIsLoadingResource = false;
}
} // namespace dom
} // namespace mozilla