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

bug 1116382 no need to check IsMediaSourceURI(mLoadingSrc) once mMediaSource has been set r=bholley

Browse Source
This commit is contained in:
Karl Tomlinson
2015-05-28 14:49:23 +12:00
parent 437bf273d4
commit 24af1f1248
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dom/html/HTMLMediaElement.cpp
View File

@@ -1082,7 +1082,7 @@ void HTMLMediaElement::UpdatePreloadAction()
kNameSpaceID_None);
// MSE doesn't work if preload is none, so it ignores the pref when src is
// from MSE.
uint32_t preloadDefault = (mLoadingSrc && IsMediaSourceURI(mLoadingSrc)) ?
uint32_t preloadDefault = mMediaSource ?
HTMLMediaElement::PRELOAD_ATTR_METADATA :
Preferences::GetInt("media.preload.default",
HTMLMediaElement::PRELOAD_ATTR_METADATA);
@@ -3435,7 +3435,7 @@ void HTMLMediaElement::CheckProgress(bool aHaveNewProgress)
if (now - mDataTime >= TimeDuration::FromMilliseconds(STALL_MS)) {
DispatchAsyncEvent(NS_LITERAL_STRING("stalled"));
if (mLoadingSrc && IsMediaSourceURI(mLoadingSrc)) {
if (mMediaSource) {
ChangeDelayLoadStatus(false);
}