chore: update browser patches to 09195c9 (#32877)

microsoft · Sep 30, 2024 · 0110340 · 0110340
1 parent 541ce9f
commit 0110340
Show file tree

Hide file tree

Showing 12 changed files with 782 additions and 748 deletions.
diff --git a/browser_patches/firefox/UPSTREAM_CONFIG.sh b/browser_patches/firefox/UPSTREAM_CONFIG.sh
@@ -1,3 +1,3 @@
 REMOTE_URL="https://github.com/mozilla/gecko-dev"
 BASE_BRANCH="release"
-BASE_REVISION="cf0397e3ba298868fdca53f894da5b0d239dc09e"
+BASE_REVISION="47bcb6d7d2013f9a3d864678675100e0b3d73c5e"
diff --git a/browser_patches/firefox/juggler/NetworkObserver.js b/browser_patches/firefox/juggler/NetworkObserver.js
@@ -145,10 +145,13 @@ class NetworkRequest {
     }
     this._expectingInterception = false;
     this._expectingResumedRequest = undefined;  // { method, headers, postData }
+    this._overriddenHeadersForRedirect = redirectedFrom?._overriddenHeadersForRedirect;
     this._sentOnResponse = false;
     this._fulfilled = false;
 
-    if (this._pageNetwork)
+    if (this._overriddenHeadersForRedirect)
+      overrideRequestHeaders(httpChannel, this._overriddenHeadersForRedirect);
+    else if (this._pageNetwork)
       appendExtraHTTPHeaders(httpChannel, this._pageNetwork.combinedExtraHTTPHeaders());
 
     this._responseBodyChunks = [];
@@ -230,20 +233,13 @@ class NetworkRequest {
     if (!this._expectingResumedRequest)
       return;
     const { method, headers, postData } = this._expectingResumedRequest;
+    this._overriddenHeadersForRedirect = headers;
     this._expectingResumedRequest = undefined;
 
-    if (headers) {
-      for (const header of requestHeaders(this.httpChannel)) {
-        // We cannot remove the "host" header.
-        if (header.name.toLowerCase() === 'host')
-          continue;
-        this.httpChannel.setRequestHeader(header.name, '', false /* merge */);
-      }
-      for (const header of headers)
-        this.httpChannel.setRequestHeader(header.name, header.value, false /* merge */);
-    } else if (this._pageNetwork) {
+    if (headers)
+      overrideRequestHeaders(this.httpChannel, headers);
+    else if (this._pageNetwork)
       appendExtraHTTPHeaders(this.httpChannel, this._pageNetwork.combinedExtraHTTPHeaders());
-    }
     if (method)
       this.httpChannel.requestMethod = method;
     if (postData !== undefined)
@@ -773,6 +769,20 @@ function requestHeaders(httpChannel) {
   return headers;
 }
 
+function clearRequestHeaders(httpChannel) {
+  for (const header of requestHeaders(httpChannel)) {
+    // We cannot remove the "host" header.
+    if (header.name.toLowerCase() === 'host')
+      continue;
+    httpChannel.setRequestHeader(header.name, '', false /* merge */);
+  }
+}
+
+function overrideRequestHeaders(httpChannel, headers) {
+  clearRequestHeaders(httpChannel);
+  appendExtraHTTPHeaders(httpChannel, headers);
+}
+
 function causeTypeToString(causeType) {
   for (let key in Ci.nsIContentPolicy) {
     if (Ci.nsIContentPolicy[key] === causeType)

diff --git a/browser_patches/firefox/juggler/content/FrameTree.js b/browser_patches/firefox/juggler/content/FrameTree.js
@@ -46,8 +46,6 @@ class FrameTree {
       Ci.nsISupportsWeakReference,
     ]);
 
-    this._addedScrollbarsStylesheetSymbol = Symbol('_addedScrollbarsStylesheetSymbol');
-
     this._wdm = Cc["@mozilla.org/dom/workers/workerdebuggermanager;1"].createInstance(Ci.nsIWorkerDebuggerManager);
     this._wdmListener = {
       QueryInterface: ChromeUtils.generateQI([Ci.nsIWorkerDebuggerManagerListener]),
@@ -130,24 +128,12 @@ class FrameTree {
   }
 
   _onDOMWindowCreated(window) {
-    if (!window[this._addedScrollbarsStylesheetSymbol] && this.scrollbarsHidden) {
-      const styleSheetService = Cc["@mozilla.org/content/style-sheet-service;1"].getService(Components.interfaces.nsIStyleSheetService);
-      const ioService = Cc["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService);
-      const uri = ioService.newURI('chrome://juggler/content/content/hidden-scrollbars.css', null, null);
-      const sheet = styleSheetService.preloadSheet(uri, styleSheetService.AGENT_SHEET);
-      window.windowUtils.addSheet(sheet, styleSheetService.AGENT_SHEET);
-      window[this._addedScrollbarsStylesheetSymbol] = true;
-    }
     const frame = this.frameForDocShell(window.docShell);
     if (!frame)
       return;
     frame._onGlobalObjectCleared();
   }
 
-  setScrollbarsHidden(hidden) {
-    this.scrollbarsHidden = hidden;
-  }
-
   setJavaScriptDisabled(javaScriptDisabled) {
     this._javaScriptDisabled = javaScriptDisabled;
     for (const frame of this.frames())

diff --git a/browser_patches/firefox/juggler/content/PageAgent.js b/browser_patches/firefox/juggler/content/PageAgent.js
@@ -120,7 +120,8 @@ class PageAgent {
           // After the dragStart event is dispatched and handled by Web,
           // it might or might not create a new drag session, depending on its preventing default.
           setTimeout(() => {
-            this._browserPage.emit('pageInputEvent', { type: 'juggler-drag-finalized', dragSessionStarted: !!dragService.getCurrentSession() });
+            const session = this._getCurrentDragSession();
+            this._browserPage.emit('pageInputEvent', { type: 'juggler-drag-finalized', dragSessionStarted: !!session });
           }, 0);
         }
       }),
@@ -526,8 +527,14 @@ class PageAgent {
     });
   }
 
+  _getCurrentDragSession() {
+    const frame = this._frameTree.mainFrame();
+    const domWindow = frame?.domWindow();
+    return domWindow ? dragService.getCurrentSession(domWindow) : undefined;
+  }
+
   async _dispatchDragEvent({type, x, y, modifiers}) {
-    const session = dragService.getCurrentSession();
+    const session = this._getCurrentDragSession();
     const dropEffect = session.dataTransfer.dropEffect;
 
     if ((type === 'drop' && dropEffect !== 'none') || type ===  'dragover') {
@@ -551,9 +558,8 @@ class PageAgent {
       return;
     }
     if (type === 'dragend') {
-      const session = dragService.getCurrentSession();
-      if (session)
-        dragService.endDragSession(true);
+      const session = this._getCurrentDragSession();
+      session?.endDragSession(true);
       return;
     }
   }

diff --git a/browser_patches/firefox/juggler/content/main.js b/browser_patches/firefox/juggler/content/main.js
@@ -45,10 +45,6 @@ function initialize(browsingContext, docShell) {
       docShell.languageOverride = locale;
     },
 
-    scrollbarsHidden: (hidden) => {
-      data.frameTree.setScrollbarsHidden(hidden);
-    },
-
     javaScriptDisabled: (javaScriptDisabled) => {
       data.frameTree.setJavaScriptDisabled(javaScriptDisabled);
     },

diff --git a/browser_patches/firefox/juggler/protocol/BrowserHandler.js b/browser_patches/firefox/juggler/protocol/BrowserHandler.js
@@ -255,10 +255,6 @@ class BrowserHandler {
     await this._targetRegistry.browserContextForId(browserContextId).setDefaultViewport(nullToUndefined(viewport));
   }
 
-  async ['Browser.setScrollbarsHidden']({browserContextId, hidden}) {
-    await this._targetRegistry.browserContextForId(browserContextId).applySetting('scrollbarsHidden', nullToUndefined(hidden));
-  }
-
   async ['Browser.setInitScripts']({browserContextId, scripts}) {
     await this._targetRegistry.browserContextForId(browserContextId).setInitScripts(scripts);
   }

diff --git a/browser_patches/firefox/juggler/protocol/PageHandler.js b/browser_patches/firefox/juggler/protocol/PageHandler.js
@@ -256,13 +256,6 @@ class PageHandler {
     return await this._contentPage.send('disposeObject', options);
   }
 
-  async ['Heap.collectGarbage']() {
-    Services.obs.notifyObservers(null, "child-gc-request");
-    Cu.forceGC();
-    Services.obs.notifyObservers(null, "child-cc-request");
-    Cu.forceCC();
-  }
-
   async ['Network.getResponseBody']({requestId}) {
     return this._pageNetwork.getResponseBody(requestId);
   }

diff --git a/browser_patches/firefox/juggler/protocol/Protocol.js b/browser_patches/firefox/juggler/protocol/Protocol.js
@@ -394,12 +394,6 @@ const Browser = {
         viewport: t.Nullable(pageTypes.Viewport),
       }
     },
-    'setScrollbarsHidden': {
-      params: {
-        browserContextId: t.Optional(t.String),
-        hidden: t.Boolean,
-      }
-    },
     'setInitScripts': {
       params: {
         browserContextId: t.Optional(t.String),
@@ -487,17 +481,6 @@ const Browser = {
   },
 };
 
-const Heap = {
-  targets: ['page'],
-  types: {},
-  events: {},
-  methods: {
-    'collectGarbage': {
-      params: {},
-    },
-  },
-};
-
 const Network = {
   targets: ['page'],
   types: networkTypes,
@@ -1013,7 +996,7 @@ const Accessibility = {
 }
 
 this.protocol = {
-  domains: {Browser, Heap, Page, Runtime, Network, Accessibility},
+  domains: {Browser, Page, Runtime, Network, Accessibility},
 };
 this.checkScheme = checkScheme;
 this.EXPORTED_SYMBOLS = ['protocol', 'checkScheme'];