Bug 1968644 - Part 10: Store JSCallingLocation and set the JSCallingLocation fallback for Media loads. r=emilio

Differential Revision: https://phabricator.services.mozilla.com/D253347

Author: artines1

dom/html/HTMLMediaElement.cpp

@@ -1810,11 +1810,16 @@ class HTMLMediaElement::ChannelLoader final {
  public:
   NS_INLINE_DECL_REFCOUNTING(ChannelLoader);
 
+  explicit ChannelLoader(const JSCallingLocation& aCallingLocation)
+      : mCallingLocation(aCallingLocation) {}
+
   void LoadInternal(HTMLMediaElement* aElement) {
     if (mCancelled) {
       return;
     }
 
+    JSCallingLocation::AutoFallback fallback(&mCallingLocation);
+
     // determine what security checks need to be performed in AsyncOpen().
     nsSecurityFlags securityFlags =
         aElement->ShouldCheckAllowOrigin()
@@ -1991,6 +1996,7 @@ class HTMLMediaElement::ChannelLoader final {
   nsCOMPtr<nsIChannel> mChannel;
 
   bool mCancelled = false;
+  JSCallingLocation mCallingLocation;
 };
 
 class HTMLMediaElement::ErrorSink {
@@ -2613,9 +2619,9 @@ void HTMLMediaElement::QueueLoadFromSourceTask() {
 
   ChangeDelayLoadStatus(true);
   ChangeNetworkState(NETWORK_LOADING);
-  RefPtr<Runnable> r =
-      NewRunnableMethod("HTMLMediaElement::LoadFromSourceChildren", this,
-                        &HTMLMediaElement::LoadFromSourceChildren);
+  RefPtr<Runnable> r = NewRunnableMethod<JSCallingLocation>(
+      "HTMLMediaElement::LoadFromSourceChildren", this,
+      &HTMLMediaElement::LoadFromSourceChildren, JSCallingLocation::Get());
   RunInStableState(r);
 }
 
@@ -2624,9 +2630,9 @@ void HTMLMediaElement::QueueSelectResourceTask() {
   if (mHaveQueuedSelectResource) return;
   mHaveQueuedSelectResource = true;
   ChangeNetworkState(NETWORK_NO_SOURCE);
-  RefPtr<Runnable> r =
-      NewRunnableMethod("HTMLMediaElement::SelectResourceWrapper", this,
-                        &HTMLMediaElement::SelectResourceWrapper);
+  RefPtr<Runnable> r = NewRunnableMethod<JSCallingLocation>(
+      "HTMLMediaElement::SelectResourceWrapper", this,
+      &HTMLMediaElement::SelectResourceWrapper, JSCallingLocation::Get());
   RunInStableState(r);
 }
 
@@ -2730,15 +2736,17 @@ void HTMLMediaElement::ResetState() {
   }
 }
 
-void HTMLMediaElement::SelectResourceWrapper() {
-  SelectResource();
+void HTMLMediaElement::SelectResourceWrapper(
+    const JSCallingLocation& aCallingLocation) {
+  SelectResource(aCallingLocation);
   MaybeBeginCloningVisually();
   mIsRunningSelectResource = false;
   mHaveQueuedSelectResource = false;
   mIsDoingExplicitLoad = false;
 }
 
-void HTMLMediaElement::SelectResource() {
+void HTMLMediaElement::SelectResource(
+    const JSCallingLocation& aCallingLocation) {
   if (!mSrcAttrStream && !HasAttr(nsGkAtoms::src) && !HasSourceChildren(this)) {
     // The media element has neither a src attribute nor any source
     // element children, abort the load.
@@ -2755,7 +2763,7 @@ void HTMLMediaElement::SelectResource() {
   // Delay setting mIsRunningSeletResource until after UpdatePreloadAction
   // so that we don't lose our state change by bailing out of the preload
   // state update
-  UpdatePreloadAction();
+  UpdatePreloadAction(aCallingLocation);
   mIsRunningSelectResource = true;
 
   // If we have a 'src' attribute, use that exclusively.
@@ -2794,15 +2802,15 @@ void HTMLMediaElement::SelectResource() {
         OwnerDoc()->AddMediaElementWithMSE();
       }
       DDLINKCHILD("mediasource", mMediaSource.get());
-      UpdatePreloadAction();
+      UpdatePreloadAction(aCallingLocation);
       if (mPreloadAction == HTMLMediaElement::PRELOAD_NONE && !mMediaSource) {
         // preload:none media, suspend the load here before we make any
         // network requests.
         SuspendLoad();
         return;
       }
 
-      rv = LoadResource();
+      rv = LoadResource(aCallingLocation);
       if (NS_SUCCEEDED(rv)) {
         return;
       }
@@ -2815,7 +2823,7 @@ void HTMLMediaElement::SelectResource() {
   } else {
     // Otherwise, the source elements will be used.
     mIsLoadingFromSourceChildren = true;
-    LoadFromSourceChildren();
+    LoadFromSourceChildren(aCallingLocation);
   }
 }
 
@@ -2970,7 +2978,8 @@ void HTMLMediaElement::DealWithFailedElement(nsIContent* aSourceElement) {
                         &HTMLMediaElement::QueueLoadFromSourceTask));
 }
 
-void HTMLMediaElement::LoadFromSourceChildren() {
+void HTMLMediaElement::LoadFromSourceChildren(
+    const JSCallingLocation& aCallingLocation) {
   NS_ASSERTION(mDelayingLoadEvent,
                "Should delay load event (if in document) during load");
   NS_ASSERTION(mIsLoadingFromSourceChildren,
@@ -3087,7 +3096,7 @@ void HTMLMediaElement::LoadFromSourceChildren() {
       return;
     }
 
-    if (NS_SUCCEEDED(LoadResource())) {
+    if (NS_SUCCEEDED(LoadResource(aCallingLocation))) {
       return;
     }
 
@@ -3103,7 +3112,8 @@ void HTMLMediaElement::SuspendLoad() {
   ChangeDelayLoadStatus(false);
 }
 
-void HTMLMediaElement::ResumeLoad(PreloadAction aAction) {
+void HTMLMediaElement::ResumeLoad(PreloadAction aAction,
+                                  const JSCallingLocation& aCallingLocation) {
   NS_ASSERTION(mSuspendedForPreloadNone,
                "Must be halted for preload:none to resume from preload:none "
                "suspended load.");
@@ -3113,15 +3123,15 @@ void HTMLMediaElement::ResumeLoad(PreloadAction aAction) {
   ChangeNetworkState(NETWORK_LOADING);
   if (!mIsLoadingFromSourceChildren) {
     // We were loading from the element's src attribute.
-    MediaResult rv = LoadResource();
+    MediaResult rv = LoadResource(aCallingLocation);
     if (NS_FAILED(rv)) {
       NoSupportedMediaSourceError(rv.Description());
     }
   } else {
     // We were loading from a child <source> element. Try to resume the
     // load of that child, and if that fails, try the next child.
-    if (NS_FAILED(LoadResource())) {
-      LoadFromSourceChildren();
+    if (NS_FAILED(LoadResource(aCallingLocation))) {
+      LoadFromSourceChildren(aCallingLocation);
     }
   }
 }
@@ -3151,7 +3161,8 @@ uint32_t HTMLMediaElement::GetPreloadDefaultAuto() const {
                              HTMLMediaElement::PRELOAD_ENOUGH);
 }
 
-void HTMLMediaElement::UpdatePreloadAction() {
+void HTMLMediaElement::UpdatePreloadAction(
+    const JSCallingLocation& aCallingLocation) {
   PreloadAction nextAction = PRELOAD_UNDEFINED;
   // If autoplay is set, or we're playing, we should always preload data,
   // as we'll need it to play.
@@ -3201,7 +3212,7 @@ void HTMLMediaElement::UpdatePreloadAction() {
       // Our load was previouly suspended due to the media having preload
       // value "none". The preload value has changed to preload:auto, so
       // resume the load.
-      ResumeLoad(PRELOAD_ENOUGH);
+      ResumeLoad(PRELOAD_ENOUGH, aCallingLocation);
     } else {
       // Preload as much of the video as we can, i.e. don't suspend after
       // the first frame.
@@ -3226,12 +3237,13 @@ void HTMLMediaElement::UpdatePreloadAction() {
       // value "none". The preload value has changed to preload:metadata, so
       // resume the load. We'll pause the load again after we've read the
       // metadata.
-      ResumeLoad(PRELOAD_METADATA);
+      ResumeLoad(PRELOAD_METADATA, aCallingLocation);
     }
   }
 }
 
-MediaResult HTMLMediaElement::LoadResource() {
+MediaResult HTMLMediaElement::LoadResource(
+    const JSCallingLocation& aCallingLocation) {
   NS_ASSERTION(mDelayingLoadEvent,
                "Should delay load event (if in document) during load");
 
@@ -3283,7 +3295,7 @@ MediaResult HTMLMediaElement::LoadResource() {
 
   AssertReadyStateIsNothing();
 
-  RefPtr<ChannelLoader> loader = new ChannelLoader;
+  RefPtr<ChannelLoader> loader = new ChannelLoader(aCallingLocation);
   nsresult rv = loader->Load(this);
   if (NS_SUCCEEDED(rv)) {
     mChannelLoader = std::move(loader);
@@ -4711,7 +4723,7 @@ void HTMLMediaElement::PlayInternal(bool aHandlingUserInput) {
   // invoke the media element's resource selection algorithm.
   MaybeDoLoad();
   if (mSuspendedForPreloadNone) {
-    ResumeLoad(PRELOAD_ENOUGH);
+    ResumeLoad(PRELOAD_ENOUGH, JSCallingLocation::Get());
   }
 
   // 4.8.12.8 - Step 5:
@@ -4742,7 +4754,7 @@ void HTMLMediaElement::PlayInternal(bool aHandlingUserInput) {
   // We changed mPaused and mCanAutoplayFlag which can affect
   // AddRemoveSelfReference and our preload status.
   AddRemoveSelfReference();
-  UpdatePreloadAction();
+  UpdatePreloadAction(JSCallingLocation::Get());
   UpdateSrcMediaStreamPlaying();
   StartMediaControlKeyListenerIfNeeded();
 
@@ -5041,10 +5053,10 @@ void HTMLMediaElement::AfterSetAttr(int32_t aNameSpaceID, nsAtom* aName,
         }
         // This attribute can affect AddRemoveSelfReference
         AddRemoveSelfReference();
-        UpdatePreloadAction();
+        UpdatePreloadAction(JSCallingLocation::Get());
       }
     } else if (aName == nsGkAtoms::preload) {
-      UpdatePreloadAction();
+      UpdatePreloadAction(JSCallingLocation::Get());
     } else if (aName == nsGkAtoms::loop) {
       if (mDecoder) {
         mDecoder->SetLooping(!!aValue);
@@ -5092,7 +5104,7 @@ nsresult HTMLMediaElement::BindToTree(BindContext& aContext, nsINode& aParent) {
 
     // The preload action depends on the value of the autoplay attribute.
     // It's value may have changed, so update it.
-    UpdatePreloadAction();
+    UpdatePreloadAction(JSCallingLocation::Get());
   }
 
   NotifyDecoderActivityChanges();

dom/html/HTMLMediaElement.h

@@ -1113,7 +1113,7 @@ class HTMLMediaElement : public nsGenericHTMLElement,
    * substep of the resource selection algorithm. Do not call this directly,
    * call QueueLoadFromSourceTask() instead.
    */
-  void LoadFromSourceChildren();
+  void LoadFromSourceChildren(const JSCallingLocation& aCallingLocation);
 
   /**
    * Asynchronously awaits a stable state, and then causes
@@ -1124,13 +1124,13 @@ class HTMLMediaElement : public nsGenericHTMLElement,
   /**
    * Runs the media resource selection algorithm.
    */
-  void SelectResource();
+  void SelectResource(const JSCallingLocation& aCallingLocation);
 
   /**
    * A wrapper function that allows us to cleanly reset flags after a call
    * to SelectResource()
    */
-  void SelectResourceWrapper();
+  void SelectResourceWrapper(const JSCallingLocation& aCallingLocation);
 
   /**
    * Asynchronously awaits a stable state, and then causes SelectResource()
@@ -1147,7 +1147,7 @@ class HTMLMediaElement : public nsGenericHTMLElement,
   /**
    * The resource-fetch algorithm step of the load algorithm.
    */
-  MediaResult LoadResource();
+  MediaResult LoadResource(const JSCallingLocation& aCallingLocation);
 
   /**
    * Selects the next <source> child from which to load a resource. Called
@@ -1215,7 +1215,8 @@ class HTMLMediaElement : public nsGenericHTMLElement,
    * Will continue running the resource selection algorithm.
    * Sets mPreloadAction to aAction.
    */
-  void ResumeLoad(PreloadAction aAction);
+  void ResumeLoad(PreloadAction aAction,
+                  const JSCallingLocation& aCallingLocation);
 
   /**
    * Handle a change to the preload attribute. Should be called whenever the
@@ -1224,7 +1225,7 @@ class HTMLMediaElement : public nsGenericHTMLElement,
    * element. If there is a change then this method will initiate any
    * behaviour that is necessary to implement the action.
    */
-  void UpdatePreloadAction();
+  void UpdatePreloadAction(const JSCallingLocation& aCallingLocation);
 
   /**
    * Fire progress events if needed according to the time and byte constraints