Bug 1292157: Ignore preload value when dealing with MediaSource originated URI. r?jwwang draft
authorJean-Yves Avenard <jyavenard@mozilla.com>
Fri, 05 Aug 2016 11:15:50 +1000
changeset 396992 248ec8f451097842a884c8e59e647324a3e95a78
parent 396991 c01dd175139799f7086a5f5b287a074a63cc6d47
child 397078 50a3013be6debac8136e59f100a8905dec9c52f7
push id25168
push userbmo:jyavenard@mozilla.com
push dateFri, 05 Aug 2016 01:18:35 +0000
reviewersjwwang
bugs1292157
milestone50.0a1
Bug 1292157: Ignore preload value when dealing with MediaSource originated URI. r?jwwang MozReview-Commit-ID: CN9w9XJj2YR
dom/html/HTMLMediaElement.cpp
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -1195,17 +1195,17 @@ void HTMLMediaElement::SelectResource()
       NS_ASSERTION(!mIsLoadingFromSourceChildren,
         "Should think we're not loading from source children by default");
 
       RemoveMediaElementFromURITable();
       mLoadingSrc = uri;
       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();
         return;
       }
 
       rv = LoadResource();
       if (NS_SUCCEEDED(rv)) {
@@ -1350,17 +1350,17 @@ void HTMLMediaElement::LoadFromSourceChi
 
     RemoveMediaElementFromURITable();
     mLoadingSrc = uri;
     mMediaSource = childSrc->GetSrcMediaSource();
     NS_ASSERTION(mNetworkState == nsIDOMHTMLMediaElement::NETWORK_LOADING,
                  "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();
       return;
     }
 
     if (NS_SUCCEEDED(LoadResource())) {
       return;