68.14.3 - everything else

Feodor2 · Jul 21, 2024 · 48cfaac · 48cfaac
1 parent 2c2b226
commit 48cfaac
Show file tree

Hide file tree

Showing 1,138 changed files with 20,146 additions and 35,861 deletions.
diff --git a/.clang-format-ignore b/.clang-format-ignore
@@ -63,10 +63,6 @@ devtools/client/shared/sourceeditor/codemirror/.*
 devtools/client/shared/sourceeditor/tern/.*
 dom/canvas/test/webgl-conf/checkout/closure-library/.*
 dom/media/gmp/rlz/.*
-dom/media/gmp/widevine-adapter/content_decryption_module.h
-dom/media/gmp/widevine-adapter/content_decryption_module_export.h
-dom/media/gmp/widevine-adapter/content_decryption_module_ext.h
-dom/media/gmp/widevine-adapter/content_decryption_module_proxy.h
 dom/media/platforms/ffmpeg/ffmpeg57/.*
 dom/media/platforms/ffmpeg/ffmpeg58/.*
 dom/media/platforms/ffmpeg/libav53/.*
@@ -111,7 +107,6 @@ js/src/vtune/jitprofiling.c
 js/src/vtune/jitprofiling.h
 js/src/vtune/legacy/.*
 media/ffvpx/.*
-media/gmp-clearkey/0.1/openaes/.*
 media/kiss_fft/.*
 media/libaom/.*
 media/libcubeb/.*

diff --git a/.eslintignore b/.eslintignore
@@ -210,7 +210,6 @@ layout/mathml/imptests/
 # Exclude everything but self-hosted JS
 js/ductwork/
 js/examples/
-js/ipc/
 js/public/
 js/xpconnect/
 js/src/devtools/

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -71,13 +71,6 @@ module.exports = {
     "env": {
       "mozilla/browser-window": true
     }
-  }, {
-    // TODO: Bug 1513639. Temporarily turn off reject-importGlobalProperties
-    // due to other ESLint enabling happening in DOM.
-    "files": "dom/**",
-    "rules": {
-      "mozilla/reject-importGlobalProperties": "off",
-    }
   }, {
     // TODO: Bug 1515949. Enable no-undef for gfx/
     "files": "gfx/layers/apz/test/mochitest/**",

diff --git a/.gdbinit_python b/.gdbinit_python
@@ -1,5 +1,5 @@
 python
 import sys
-sys.path.append('third_party/python/gdbpp/')
+sys.path.append('python/gdbpp/')
 import gdbpp
 end
diff --git a/.gitignore b/.gitignore
@@ -99,6 +99,9 @@ devtools/client/debugger/assets/module-manifest.json
 # Ignore node_modules directories in devtools
 devtools/**/node_modules
 
+# Ignore browsertime output directory
+browsertime-results
+
 # Tag files generated by GNU Global
 GTAGS
 GRTAGS

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile.in b/Makefile.in
@@ -150,13 +150,6 @@ endif
 recurse_artifact:
 	$(topsrcdir)/mach --log-no-times artifact install$(if $(MOZ_ARTIFACT_BUILD_SYMBOLS), --symbols$(addprefix =,$(filter full,$(MOZ_ARTIFACT_BUILD_SYMBOLS))))$(if $(MOZ_AUTOMATION), --host-bins)
 
-ifdef MOZ_EME_WIN32_ARTIFACT
-recurse_win32-artifact:
-	rm -rf $(DIST)/i686
-	$(topsrcdir)/mach --log-no-times artifact install --job $(if $(MOZ_PGO),win32-pgo,win32-opt) --no-tests --distdir $(DIST)/i686
-	mv $(DIST)/i686/bin/* $(DIST)/i686
-endif
-
 ifdef MOZ_ANDROID_FAT_AAR_ARCHITECTURES
 recurse_android-fat-aar-artifact:
 	$(call py_action,fat_aar,$(MOZ_ANDROID_FAT_AAR_ARCHITECTURES) --distdir $(abspath $(DIST)/fat-aar))

diff --git a/accessible/tests/browser/events/browser_test_focus_urlbar.js b/accessible/tests/browser/events/browser_test_focus_urlbar.js
@@ -31,19 +31,10 @@ function isEventForAutocompleteItem(event) {
  * search isn't finished yet.
  */
 function waitForSearchFinish() {
-  if (UrlbarPrefs.get("quantumbar")) {
-    return Promise.all([
-      gURLBar.lastQueryContextPromise,
-      BrowserTestUtils.waitForCondition(() => gURLBar.view.isOpen),
-    ]);
-  }
-  return BrowserTestUtils.waitForCondition(
-    () =>
-      gURLBar.popupOpen &&
-      gURLBar.controller.searchStatus >=
-        Ci.nsIAutoCompleteController.STATUS_COMPLETE_NO_MATCH,
-    "Waiting for search to complete"
-  );
+  return Promise.all([
+    gURLBar.lastQueryContextPromise,
+    BrowserTestUtils.waitForCondition(() => gURLBar.view.isOpen),
+  ]);
 }
 
 // Check that the URL bar manages accessibility focus appropriately.
@@ -132,9 +123,7 @@ async function runTests() {
   EventUtils.synthesizeKey("KEY_ArrowLeft");
   await focused;
   testStates(textBox, STATE_FOCUSED);
-  if (UrlbarPrefs.get("quantumbar")) {
-    gURLBar.view.close();
-  }
+  gURLBar.view.close();
   // On Mac, down arrow when not at the end of the field moves to the end.
   // Move back to the end so the next press of down arrow opens the popup.
   EventUtils.synthesizeKey("KEY_ArrowRight");

diff --git a/accessible/tests/browser/general/browser_test_urlbar.js b/accessible/tests/browser/general/browser_test_urlbar.js
@@ -14,9 +14,7 @@ add_task(async function testAutocompleteRichResult() {
   let tab = await openNewTab("data:text/html;charset=utf-8,");
   let accService = await initAccessibilityService();
 
-  info(
-    "Opening the URL bar and entering a key to show the PopupAutoCompleteRichResult panel"
-  );
+  info("Opening the URL bar and entering a key to show the urlbar panel");
   await UrlbarTestUtils.promiseAutocompleteResultPopup({
     window,
     waitForFocus,
@@ -25,22 +23,10 @@ add_task(async function testAutocompleteRichResult() {
 
   info("Waiting for accessibility to be created for the richlistbox");
   let resultsView;
-  if (UrlbarPrefs.get("quantumbar")) {
-    resultsView = gURLBar.view.panel.querySelector("#urlbarView-results");
-    await BrowserTestUtils.waitForCondition(() =>
-      accService.getAccessibleFor(resultsView)
-    );
-  } else {
-    let urlbarPopup = document.getElementById("PopupAutoCompleteRichResult");
-    resultsView = document.getAnonymousElementByAttribute(
-      urlbarPopup,
-      "anonid",
-      "richlistbox"
-    );
-    await BrowserTestUtils.waitForCondition(() =>
-      accService.getAccessibleFor(resultsView)
-    );
-  }
+  resultsView = gURLBar.view.panel.querySelector("#urlbarView-results");
+  await BrowserTestUtils.waitForCondition(() =>
+    accService.getAccessibleFor(resultsView)
+  );
 
   info("Confirming that the special case is handled in XULListboxAccessible");
   let accessible = accService.getAccessibleFor(resultsView);

diff --git a/browser/actors/ContextMenuChild.jsm b/browser/actors/ContextMenuChild.jsm
@@ -27,6 +27,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
   InlineSpellCheckerContent:
     "resource://gre/modules/InlineSpellCheckerContent.jsm",
+  ContentDOMReference: "resource://gre/modules/ContentDOMReference.jsm",
 });
 
 XPCOMUtils.defineLazyGetter(this, "PageMenuChild", () => {
@@ -188,6 +189,8 @@ const messageListeners = {
     let ctxDraw = canvas.getContext("2d");
     ctxDraw.drawImage(video, 0, 0);
 
+    // Note: if changing the content type, don't forget to update
+    // consumers that also hardcode this content type.
     this.mm.sendAsyncMessage("ContextMenu:SaveVideoFrameAsImage:Result", {
       dataURL: canvas.toDataURL("image/jpeg", ""),
     });
@@ -531,7 +534,7 @@ class ContextMenuChild extends ActorChild {
     // The same-origin check will be done in nsContextMenu.openLinkInTab.
     let parentAllowsMixedContent = !!this.docShell.mixedContentChannel;
 
-    let disableSetDesktopBg = null;
+    let disableSetDesktopBackground = null;
 
     // Media related cache info parent needs for saving
     let contentType = null;
@@ -541,7 +544,7 @@ class ContextMenuChild extends ActorChild {
       aEvent.composedTarget instanceof Ci.nsIImageLoadingContent &&
       aEvent.composedTarget.currentURI
     ) {
-      disableSetDesktopBg = this._disableSetDesktopBackground(
+      disableSetDesktopBackground = this._disableSetDesktopBackground(
         aEvent.composedTarget
       );
 
@@ -587,6 +590,7 @@ class ContextMenuChild extends ActorChild {
       Ci.nsIReferrerInfo
     );
     referrerInfo.initWithElement(aEvent.composedTarget);
+    referrerInfo = E10SUtils.serializeReferrerInfo(referrerInfo);
 
     // In the case "onLink" we may have to send link referrerInfo to use in
     // _openLinkInParameters
@@ -598,45 +602,38 @@ class ContextMenuChild extends ActorChild {
       linkReferrerInfo.initWithElement(context.link);
     }
 
-    let targetAsCPOW = context.target;
-    if (targetAsCPOW) {
+    let target = context.target;
+    if (target) {
       this._cleanContext();
     }
 
-    let isRemote =
-      Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT;
+    editFlags = SpellCheckHelper.isEditable(
+      aEvent.composedTarget,
+      this.content
+    );
 
-    if (isRemote) {
-      editFlags = SpellCheckHelper.isEditable(
-        aEvent.composedTarget,
-        this.content
+    if (editFlags & SpellCheckHelper.SPELLCHECKABLE) {
+      spellInfo = InlineSpellCheckerContent.initContextMenu(
+        aEvent,
+        editFlags,
+        this
       );
+    }
 
-      if (editFlags & SpellCheckHelper.SPELLCHECKABLE) {
-        spellInfo = InlineSpellCheckerContent.initContextMenu(
-          aEvent,
-          editFlags,
-          this.mm
-        );
-      }
-
-      // Set the event target first as the copy image command needs it to
-      // determine what was context-clicked on. Then, update the state of the
-      // commands on the context menu.
-      this.docShell.contentViewer
-        .QueryInterface(Ci.nsIContentViewerEdit)
-        .setCommandNode(aEvent.composedTarget);
-      aEvent.composedTarget.ownerGlobal.updateCommands("contentcontextmenu");
+    // Set the event target first as the copy image command needs it to
+    // determine what was context-clicked on. Then, update the state of the
+    // commands on the context menu.
+    this.docShell.contentViewer
+      .QueryInterface(Ci.nsIContentViewerEdit)
+      .setCommandNode(aEvent.composedTarget);
+    aEvent.composedTarget.ownerGlobal.updateCommands("contentcontextmenu");
 
-      customMenuItems = PageMenuChild.build(aEvent.composedTarget);
-      principal = doc.nodePrincipal;
-    }
+    principal = doc.nodePrincipal;
 
     let data = {
       context,
       charSet,
       baseURI,
-      isRemote,
       referrerInfo,
       editFlags,
       principal,
@@ -650,54 +647,37 @@ class ContextMenuChild extends ActorChild {
       contentDisposition,
       frameOuterWindowID,
       popupNodeSelectors,
-      disableSetDesktopBg,
+      disableSetDesktopBackground,
       parentAllowsMixedContent,
     };
 
     if (context.inFrame && !context.inSrcdocFrame) {
-      if (isRemote) {
-        data.frameReferrerInfo = E10SUtils.serializeReferrerInfo(
-          doc.referrerInfo
-        );
-      } else {
-        data.frameReferrerInfo = doc.referrerInfo;
-      }
+      data.frameReferrerInfo = E10SUtils.serializeReferrerInfo(
+        doc.referrerInfo
+      );
+    }
+
+    if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) {
+      data.customMenuItems = PageMenuChild.build(aEvent.composedTarget);
     }
 
     if (linkReferrerInfo) {
-      if (isRemote) {
-        data.linkReferrerInfo = E10SUtils.serializeReferrerInfo(linkReferrerInfo);
-      } else {
-        data.linkReferrerInfo = linkReferrerInfo;
-      }
+      data.linkReferrerInfo = E10SUtils.serializeReferrerInfo(linkReferrerInfo);
     }
 
     Services.obs.notifyObservers(
       { wrappedJSObject: data },
       "on-prepare-contextmenu"
     );
 
-    if (isRemote) {
-      data.referrerInfo = E10SUtils.serializeReferrerInfo(data.referrerInfo);
-      if (data.frameReferrerInfo) {
-        data.frameReferrerInfo =
-          E10SUtils.serializeReferrerInfo(data.frameReferrerInfo);
-      }
-
-      this.mm.sendAsyncMessage("contextmenu", data, {
-        targetAsCPOW,
-      });
-    } else {
-      let browser = this.docShell.chromeEventHandler;
-      let mainWin = browser.ownerGlobal;
+    // In the event that the content is running in the parent process, we don't
+    // actually want the contextmenu events to reach the parent - we'll dispatch
+    // a new contextmenu event after the async message has reached the parent
+    // instead.
+    aEvent.preventDefault();
+    aEvent.stopPropagation();
 
-      data.documentURIObject = doc.documentURIObject;
-      data.disableSetDesktopBackground = data.disableSetDesktopBg;
-      delete data.disableSetDesktopBg;
-
-      data.context.targetAsCPOW = targetAsCPOW;
-      mainWin.setContextMenuContentData(data);
-    }
+    this.mm.sendAsyncMessage("contextmenu", data);
   }
 
   /**
@@ -869,6 +849,7 @@ class ContextMenuChild extends ActorChild {
     // Remember the node and its owner document that was clicked
     // This may be modifed before sending to nsContextMenu
     context.target = node;
+    context.targetIdentifier = ContentDOMReference.get(node);
 
     context.principal = context.target.ownerDocument.nodePrincipal;
     context.storagePrincipal =