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

Bug 1292157: Ignore preload value when dealing with MediaSource originated URI. r=jwwang

Browse Source 
MozReview-Commit-ID: CN9w9XJj2YR
This commit is contained in:
Jean-Yves Avenard
2016-08-05 11:15:50 +10:00
parent de78c4f2bd
commit 08d5f03820
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

@@ -1212,7 +1212,7 @@ void HTMLMediaElement::SelectResource()
mMediaSource = mSrcMediaSource;
UpdatePreloadAction();
if (mPreloadAction == HTMLMediaElement::PRELOAD_NONE &&
!IsMediaStreamURI(mLoadingSrc)) {
!IsMediaStreamURI(mLoadingSrc) && !mMediaSource) {
// preload:none media, suspend the load here before we make any
// network requests.
SuspendLoad();
@@ -1367,7 +1367,7 @@ void HTMLMediaElement::LoadFromSourceChildren()
"Network state should be loading");
if (mPreloadAction == HTMLMediaElement::PRELOAD_NONE &&
!IsMediaStreamURI(mLoadingSrc)) {
!IsMediaStreamURI(mLoadingSrc) && !mMediaSource) {
// preload:none media, suspend the load here before we make any
// network requests.
SuspendLoad();