Bug 1304948 - part2: Don't run TimeMarchesOn when shutdown. r=rillian
MozReview-Commit-ID: AE6FE74ESHN
--- a/dom/html/TextTrackManager.cpp
+++ b/dom/html/TextTrackManager.cpp
@@ -583,18 +583,18 @@ TextTrackManager::DispatchTimeMarchesOn(
// https://html.spec.whatwg.org/multipage/embedded-content.html#time-marches-on
void
TextTrackManager::TimeMarchesOn()
{
NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
WEBVTT_LOG("TimeMarchesOn");
mTimeMarchesOnDispatched = false;
- // Early return if we don't have any TextTracks.
- if (!mTextTracks || mTextTracks->Length() == 0) {
+ // Early return if we don't have any TextTracks or shutting down.
+ if (!mTextTracks || mTextTracks->Length() == 0 || mShutdown) {
return;
}
nsISupports* parentObject =
mMediaElement->OwnerDoc()->GetParentObject();
if (NS_WARN_IF(!parentObject)) {
return;
}