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

merge mozilla-inbound to mozilla-central. r=merge a=merge

Browse Source 
MozReview-Commit-ID: 1h3kZyrtqSt
This commit is contained in:
Sebastian Hengst
2017-10-17 11:45:16 +02:00
parent 97324c6948 6d189d1fda
commit 08efa86e76
213 changed files with 2479 additions and 1241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dom/html/HTMLMediaElement.cpp
View File

@@ -4580,12 +4580,11 @@ void HTMLMediaElement::HiddenVideoStart()
// Already started, just keep it running.
return;
}
mVideoDecodeSuspendTimer = do_CreateInstance("@mozilla.org/timer;1");
mVideoDecodeSuspendTimer->SetTarget(mMainThreadEventTarget);
mVideoDecodeSuspendTimer->InitWithNamedFuncCallback(
VideoDecodeSuspendTimerCallback, this,
MediaPrefs::MDSMSuspendBackgroundVideoDelay(), nsITimer::TYPE_ONE_SHOT,
"HTMLMediaElement::VideoDecodeSuspendTimerCallback");
NS_NewTimerWithFuncCallback(getter_AddRefs(mVideoDecodeSuspendTimer),
VideoDecodeSuspendTimerCallback, this,
MediaPrefs::MDSMSuspendBackgroundVideoDelay(), nsITimer::TYPE_ONE_SHOT,
"HTMLMediaElement::VideoDecodeSuspendTimerCallback",
mMainThreadEventTarget);
}
void HTMLMediaElement::HiddenVideoStop()
@@ -5789,11 +5788,10 @@ void HTMLMediaElement::StartProgressTimer()
MOZ_ASSERT(mNetworkState == nsIDOMHTMLMediaElement::NETWORK_LOADING);
NS_ASSERTION(!mProgressTimer, "Already started progress timer.");
mProgressTimer = do_CreateInstance("@mozilla.org/timer;1");
mProgressTimer->SetTarget(mMainThreadEventTarget);
mProgressTimer->InitWithNamedFuncCallback(
ProgressTimerCallback, this, PROGRESS_MS, nsITimer::TYPE_REPEATING_SLACK,
"HTMLMediaElement::ProgressTimerCallback");
NS_NewTimerWithFuncCallback(getter_AddRefs(mProgressTimer),
ProgressTimerCallback, this, PROGRESS_MS, nsITimer::TYPE_REPEATING_SLACK,
"HTMLMediaElement::ProgressTimerCallback",
mMainThreadEventTarget);
}
void HTMLMediaElement::StartProgress()