chore: update browser_patches to May 1st (#31325)

microsoft · Jun 15, 2024 · a4deced · a4deced
1 parent 32e25a2
commit a4deced
Show file tree

Hide file tree

Showing 10 changed files with 746 additions and 817 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="f8704c84a751716bad093b9bdc482db53fe5b3ea"
+BASE_REVISION="bd7e0ac24a6fb1cddde3e45ea191b7abcc90cf56"
diff --git a/browser_patches/firefox/juggler/NetworkObserver.js b/browser_patches/firefox/juggler/NetworkObserver.js
@@ -146,6 +146,7 @@ class NetworkRequest {
     this._expectingInterception = false;
     this._expectingResumedRequest = undefined;  // { method, headers, postData }
     this._sentOnResponse = false;
+    this._fulfilled = false;
 
     if (this._pageNetwork)
       appendExtraHTTPHeaders(httpChannel, this._pageNetwork.combinedExtraHTTPHeaders());
@@ -194,6 +195,7 @@ class NetworkRequest {
 
   // Public interception API.
   fulfill(status, statusText, headers, base64body) {
+    this._fulfilled = true;
     this._interceptedChannel.synthesizeStatus(status, statusText);
     for (const header of headers) {
       this._interceptedChannel.synthesizeHeader(header.name, header.value);
@@ -801,7 +803,8 @@ class ResponseStorage {
       return;
     }
     let encodings = [];
-    if ((request.httpChannel instanceof Ci.nsIEncodedChannel) && request.httpChannel.contentEncodings && !request.httpChannel.applyConversion) {
+    // Note: fulfilled request comes with decoded body right away.
+    if ((request.httpChannel instanceof Ci.nsIEncodedChannel) && request.httpChannel.contentEncodings && !request.httpChannel.applyConversion && !request._fulfilled) {
       const encodingHeader = request.httpChannel.getResponseHeader("Content-Encoding");
       encodings = encodingHeader.split(/\s*\t*,\s*\t*/);
     }

diff --git a/browser_patches/firefox/juggler/TargetRegistry.js b/browser_patches/firefox/juggler/TargetRegistry.js
@@ -355,6 +355,7 @@ class PageTarget {
     this._screencastRecordingInfo = undefined;
     this._dialogs = new Map();
     this.forcedColors = 'no-override';
+    this.disableCache = false;
     this.mediumOverride = '';
     this.crossProcessCookie = {
       initScripts: [],
@@ -461,12 +462,26 @@ class PageTarget {
     this.updateReducedMotionOverride(browsingContext);
     this.updateForcedColorsOverride(browsingContext);
     this.updateForceOffline(browsingContext);
+    this.updateCacheDisabled(browsingContext);
   }
 
   updateForceOffline(browsingContext = undefined) {
     (browsingContext || this._linkedBrowser.browsingContext).forceOffline = this._browserContext.forceOffline;
   }
 
+  setCacheDisabled(disabled) {
+    this.disableCache = disabled;
+    this.updateCacheDisabled();
+  }
+
+  updateCacheDisabled(browsingContext = this._linkedBrowser.browsingContext) {
+    const enableFlags = Ci.nsIRequest.LOAD_NORMAL;
+    const disableFlags = Ci.nsIRequest.LOAD_BYPASS_CACHE |
+                  Ci.nsIRequest.INHIBIT_CACHING;
+
+    browsingContext.defaultLoadFlags = (this._browserContext.disableCache || this.disableCache) ? disableFlags : enableFlags;
+  }
+
   updateTouchOverride(browsingContext = undefined) {
     (browsingContext || this._linkedBrowser.browsingContext).touchEventsOverride = this._browserContext.touchOverride ? 'enabled' : 'none';
   }
@@ -837,6 +852,7 @@ class BrowserContext {
     this.defaultPlatform = null;
     this.touchOverride = false;
     this.forceOffline = false;
+    this.disableCache = false;
     this.colorScheme = 'none';
     this.forcedColors = 'no-override';
     this.reducedMotion = 'none';
@@ -938,6 +954,12 @@ class BrowserContext {
       page.updateForceOffline();
   }
 
+  setCacheDisabled(disabled) {
+    this.disableCache = disabled;
+    for (const page of this.pages)
+      page.updateCacheDisabled();
+  }
+
   async setDefaultViewport(viewport) {
     this.defaultViewportSize = viewport ? viewport.viewportSize : undefined;
     this.deviceScaleFactor = viewport ? viewport.deviceScaleFactor : undefined;

diff --git a/browser_patches/firefox/juggler/content/PageAgent.js b/browser_patches/firefox/juggler/content/PageAgent.js
@@ -152,7 +152,6 @@ class PageAgent {
         getFullAXTree: this._getFullAXTree.bind(this),
         insertText: this._insertText.bind(this),
         scrollIntoViewIfNeeded: this._scrollIntoViewIfNeeded.bind(this),
-        setCacheDisabled: this._setCacheDisabled.bind(this),
         setFileInputFiles: this._setFileInputFiles.bind(this),
         evaluate: this._runtime.evaluate.bind(this._runtime),
         callFunction: this._runtime.callFunction.bind(this._runtime),
@@ -162,15 +161,6 @@ class PageAgent {
     ];
   }
 
-  _setCacheDisabled({cacheDisabled}) {
-    const enable = Ci.nsIRequest.LOAD_NORMAL;
-    const disable = Ci.nsIRequest.LOAD_BYPASS_CACHE |
-                  Ci.nsIRequest.INHIBIT_CACHING;
-
-    const docShell = this._frameTree.mainFrame().docShell();
-    docShell.defaultLoadFlags = cacheDisabled ? disable : enable;
-  }
-
   _emitAllEvents(frame) {
     this._browserPage.emit('pageEventFired', {
       frameId: frame.id(),
@@ -519,71 +509,16 @@ class PageAgent {
       false /* aIgnoreRootScrollFrame */,
       true /* aFlushLayout */);
 
-    const {defaultPrevented: startPrevented} = await this._dispatchTouchEvent({
+    await this._dispatchTouchEvent({
       type: 'touchstart',
       modifiers,
       touchPoints: [{x, y}]
     });
-    const {defaultPrevented: endPrevented} = await this._dispatchTouchEvent({
+    await this._dispatchTouchEvent({
       type: 'touchend',
       modifiers,
       touchPoints: [{x, y}]
     });
-    if (startPrevented || endPrevented)
-      return;
-
-    const frame = this._frameTree.mainFrame();
-    const winUtils = frame.domWindow().windowUtils;
-    winUtils.jugglerSendMouseEvent(
-      'mousemove',
-      x,
-      y,
-      0 /*button*/,
-      0 /*clickCount*/,
-      modifiers,
-      false /*aIgnoreRootScrollFrame*/,
-      0.0 /*pressure*/,
-      5 /*inputSource*/,
-      true /*isDOMEventSynthesized*/,
-      false /*isWidgetEventSynthesized*/,
-      0 /*buttons*/,
-      winUtils.DEFAULT_MOUSE_POINTER_ID /* pointerIdentifier */,
-      true /*disablePointerEvent*/
-    );
-
-    winUtils.jugglerSendMouseEvent(
-      'mousedown',
-      x,
-      y,
-      0 /*button*/,
-      1 /*clickCount*/,
-      modifiers,
-      false /*aIgnoreRootScrollFrame*/,
-      0.0 /*pressure*/,
-      5 /*inputSource*/,
-      true /*isDOMEventSynthesized*/,
-      false /*isWidgetEventSynthesized*/,
-      1 /*buttons*/,
-      winUtils.DEFAULT_MOUSE_POINTER_ID /*pointerIdentifier*/,
-      true /*disablePointerEvent*/,
-    );
-
-    winUtils.jugglerSendMouseEvent(
-      'mouseup',
-      x,
-      y,
-      0 /*button*/,
-      1 /*clickCount*/,
-      modifiers,
-      false /*aIgnoreRootScrollFrame*/,
-      0.0 /*pressure*/,
-      5 /*inputSource*/,
-      true /*isDOMEventSynthesized*/,
-      false /*isWidgetEventSynthesized*/,
-      0 /*buttons*/,
-      winUtils.DEFAULT_MOUSE_POINTER_ID /*pointerIdentifier*/,
-      true /*disablePointerEvent*/,
-    );
   }
 
   async _dispatchDragEvent({type, x, y, modifiers}) {

diff --git a/browser_patches/firefox/juggler/protocol/BrowserHandler.js b/browser_patches/firefox/juggler/protocol/BrowserHandler.js
@@ -186,6 +186,10 @@ class BrowserHandler {
     this._targetRegistry.browserContextForId(browserContextId).requestInterceptionEnabled = enabled;
   }
 
+  ['Browser.setCacheDisabled']({browserContextId, cacheDisabled}) {
+    this._targetRegistry.browserContextForId(browserContextId).setCacheDisabled(cacheDisabled);
+  }
+
   ['Browser.setIgnoreHTTPSErrors']({browserContextId, ignoreHTTPSErrors}) {
     this._targetRegistry.browserContextForId(browserContextId).setIgnoreHTTPSErrors(nullToUndefined(ignoreHTTPSErrors));
   }

diff --git a/browser_patches/firefox/juggler/protocol/PageHandler.js b/browser_patches/firefox/juggler/protocol/PageHandler.js
@@ -302,8 +302,8 @@ class PageHandler {
     await this._pageTarget.activateAndRun(() => {});
   }
 
-  async ['Page.setCacheDisabled'](options) {
-    return await this._contentPage.send('setCacheDisabled', options);
+  async ['Page.setCacheDisabled']({cacheDisabled}) {
+    return await this._pageTarget.setCacheDisabled(cacheDisabled);
   }
 
   async ['Page.addBinding']({ worldName, name, script }) {

diff --git a/browser_patches/firefox/juggler/protocol/Protocol.js b/browser_patches/firefox/juggler/protocol/Protocol.js
@@ -322,6 +322,12 @@ const Browser = {
         enabled: t.Boolean,
       },
     },
+    'setCacheDisabled': {
+      params: {
+        browserContextId: t.Optional(t.String),
+        cacheDisabled: t.Boolean,
+      },
+    },
     'setGeolocationOverride': {
       params: {
         browserContextId: t.Optional(t.String),