68.14.2 - everything else

Eclipse-Community · Jun 1, 2024 · 0ed4d27 · 0ed4d27
1 parent 40ed951
commit 0ed4d27
Show file tree

Hide file tree

Showing 864 changed files with 54,593 additions and 53,978 deletions.
diff --git a/browser/actors/ContextMenuChild.jsm b/browser/actors/ContextMenuChild.jsm
@@ -655,9 +655,13 @@ class ContextMenuChild extends ActorChild {
     };
 
     if (context.inFrame && !context.inSrcdocFrame) {
-      data.frameReferrerInfo = E10SUtils.serializeReferrerInfo(
-        doc.referrerInfo
-      );
+      if (isRemote) {
+        data.frameReferrerInfo = E10SUtils.serializeReferrerInfo(
+          doc.referrerInfo
+        );
+      } else {
+        data.frameReferrerInfo = doc.referrerInfo;
+      }
     }
 
     if (linkReferrerInfo) {
@@ -962,9 +966,20 @@ class ContextMenuChild extends ActorChild {
       // currentRequestFinalURI.  We should use that as the URL for purposes of
       // deciding on the filename, if it is present. It might not be present
       // if images are blocked.
-      context.mediaURL = (
-        context.target.currentRequestFinalURI || context.target.currentURI
-      ).spec;
+      //
+      // It is important to check both the final and the current URI, as they
+      // could be different blob URIs, see bug 1625786.
+      context.mediaURL = (() => {
+        let finalURI = context.target.currentRequestFinalURI?.spec;
+        if (finalURI && this._isMediaURLReusable(finalURI)) {
+          return finalURI;
+        }
+        let currentURI = context.target.currentURI?.spec;
+        if (currentURI && this._isMediaURLReusable(currentURI)) {
+          return currentURI;
+        }
+        return "";
+      })();
 
       const descURL = context.target.getAttribute("longdesc");
 

diff --git a/browser/actors/OfflineAppsChild.jsm b/browser/actors/OfflineAppsChild.jsm
@@ -5,17 +5,10 @@
 var EXPORTED_SYMBOLS = ["OfflineAppsChild"];
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const { XPCOMUtils } = ChromeUtils.import(
-  "resource://gre/modules/XPCOMUtils.jsm"
-);
 const { ActorChild } = ChromeUtils.import(
   "resource://gre/modules/ActorChild.jsm"
 );
 
-XPCOMUtils.defineLazyModuleGetters(this, {
-  E10SUtils: "resource://gre/modules/E10SUtils.jsm",
-});
-
 class OfflineAppsChild extends ActorChild {
   constructor(dispatcher) {
     super(dispatcher);
@@ -24,15 +17,9 @@ class OfflineAppsChild extends ActorChild {
     this._docIdMap = new Map();
 
     this._docManifestSet = new Set();
-
-    this._observerAdded = false;
   }
 
   registerWindow(aWindow) {
-    if (!this._observerAdded) {
-      this._observerAdded = true;
-      Services.obs.addObserver(this, "offline-cache-update-completed", true);
-    }
     let manifestURI = this._getManifestURI(aWindow);
     this._docManifestSet.add(manifestURI.spec);
   }
@@ -95,19 +82,6 @@ class OfflineAppsChild extends ActorChild {
       this._docIdMap.delete(aMessage.data.docId);
     }
   }
-
-  observe(aSubject, aTopic, aState) {
-    if (aTopic == "offline-cache-update-completed") {
-      let cacheUpdate = aSubject.QueryInterface(Ci.nsIOfflineCacheUpdate);
-      let uri = cacheUpdate.manifestURI;
-      if (uri && this._docManifestSet.has(uri.spec)) {
-        this.mm.sendAsyncMessage("OfflineApps:CheckUsage", {
-          uri: uri.spec,
-          principal: E10SUtils.serializePrincipal(cacheUpdate.loadingPrincipal),
-        });
-      }
-    }
-  }
 }
 
 OfflineAppsChild.prototype.QueryInterface = ChromeUtils.generateQI([

diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp
@@ -5,6 +5,7 @@
 #include "nsXULAppAPI.h"
 #include "mozilla/CmdLineAndEnvUtils.h"
 #include "mozilla/XREAppData.h"
+#include "XREShellData.h"
 #include "application.ini.h"
 #include "mozilla/Bootstrap.h"
 #if defined(XP_WIN)