chore: update browser patches to 03ca0a7 (#28974)

microsoft · Jan 12, 2024 · cd922d1 · cd922d1
1 parent 01af7e5
commit cd922d1
Show file tree

Hide file tree

Showing 8 changed files with 1,165 additions and 1,705 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="bf57fe91c49f319e7f65636ed223e5f7b4b7738a"
+BASE_REVISION="7ab3cc0103090dd7bfa02e072a529b9fc784ab4e"
diff --git a/browser_patches/firefox/juggler/NetworkObserver.js b/browser_patches/firefox/juggler/NetworkObserver.js
@@ -231,8 +231,12 @@ class NetworkRequest {
     this._expectingResumedRequest = undefined;
 
     if (headers) {
-      for (const header of requestHeaders(this.httpChannel))
+      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) {

diff --git a/browser_patches/firefox/juggler/protocol/PageHandler.js b/browser_patches/firefox/juggler/protocol/PageHandler.js
@@ -394,7 +394,7 @@ class PageHandler {
           'nsIReferrerInfo',
           'init'
         );
-        referrerInfo = new ReferrerInfo(Ci.nsIHttpChannel.REFERRER_POLICY_UNSET, true, referrerURI);
+        referrerInfo = new ReferrerInfo(Ci.nsIReferrerInfo.UNSAFE_URL, true, referrerURI);
       } catch (e) {
         throw new Error(`Invalid referer: "${referer}"`);
       }

diff --git a/browser_patches/firefox/patches/bootstrap.diff b/browser_patches/firefox/patches/bootstrap.diff
diff --git a/browser_patches/firefox/preferences/playwright.cfg b/browser_patches/firefox/preferences/playwright.cfg
@@ -3,6 +3,8 @@
 // =================================================================
 // THESE ARE THE PROPERTIES THAT MUST BE ENABLED FOR JUGGLER TO WORK
 // =================================================================
+pref("dom.input_events.security.minNumTicks", 0);
+pref("dom.input_events.security.minTimeElapsedInMS", 0);
 
 pref("datareporting.policy.dataSubmissionEnabled", false);
 pref("datareporting.policy.dataSubmissionPolicyAccepted", false);
@@ -305,3 +307,5 @@ pref("extensions.blocklist.enabled", false);
 // Force Firefox Devtools to open in a separate window.
 pref("devtools.toolbox.host", "window");
 
+// Disable auto translations
+pref("browser.translations.enable", false);
diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh
@@ -1,3 +1,3 @@
 REMOTE_URL="https://github.com/WebKit/WebKit.git"
 BASE_BRANCH="main"
-BASE_REVISION="3facd67e2518ff15efe1b6cda0810e4c76e9c482"
+BASE_REVISION="bc0bc692bc9e368bbd9d530322db73b374cd6268"
diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff
diff --git a/browser_patches/webkit/pw_run.sh b/browser_patches/webkit/pw_run.sh
@@ -26,11 +26,11 @@ function runLinux() {
   GIO_DIR="";
   LD_PATH="";
   BUNDLE_DIR="";
-  DEPENDENCIES_FOLDER="DependenciesGTK";
+  DEPENDENCIES_FOLDER="WebKitBuild/DependenciesGTK";
   MINIBROWSER_FOLDER="minibrowser-gtk";
   BUILD_FOLDER="WebKitBuild/GTK";
   if [[ "$*" == *--headless* ]]; then
-    DEPENDENCIES_FOLDER="DependenciesWPE";
+    DEPENDENCIES_FOLDER="WebKitBuild/DependenciesWPE";
     MINIBROWSER_FOLDER="minibrowser-wpe";
     BUILD_FOLDER="WebKitBuild/WPE";
   fi
@@ -41,15 +41,15 @@ function runLinux() {
   if [[ -d $SCRIPT_PATH/$MINIBROWSER_FOLDER ]]; then
     MINIBROWSER="$SCRIPT_PATH/$MINIBROWSER_FOLDER/MiniBrowser"
   elif [[ -d $WK_CHECKOUT_PATH/$BUILD_FOLDER ]]; then
-    LD_PATH="$WK_CHECKOUT_PATH/$BUILD_FOLDER/$DEPENDENCIES_FOLDER/Root/lib:$SCRIPT_PATH/checkout/$BUILD_FOLDER/Release/bin"
-    GIO_DIR="$WK_CHECKOUT_PATH/$BUILD_FOLDER/$DEPENDENCIES_FOLDER/Root/lib/gio/modules"
+    LD_PATH="$WK_CHECKOUT_PATH/$DEPENDENCIES_FOLDER/Root/lib:$SCRIPT_PATH/checkout/$BUILD_FOLDER/Release/bin"
+    GIO_DIR="$WK_CHECKOUT_PATH/$DEPENDENCIES_FOLDER/Root/lib/gio/modules"
     BUNDLE_DIR="$WK_CHECKOUT_PATH/$BUILD_FOLDER/Release/lib"
     MINIBROWSER="$WK_CHECKOUT_PATH/$BUILD_FOLDER/Release/bin/MiniBrowser"
   elif [[ -f $SCRIPT_PATH/MiniBrowser ]]; then
     MINIBROWSER="$SCRIPT_PATH/MiniBrowser"
   elif [[ -d $SCRIPT_PATH/$BUILD_FOLDER ]]; then
-    LD_PATH="$SCRIPT_PATH/$BUILD_FOLDER/$DEPENDENCIES_FOLDER/Root/lib:$SCRIPT_PATH/$BUILD_FOLDER/Release/bin"
-    GIO_DIR="$SCRIPT_PATH/$BUILD_FOLDER/$DEPENDENCIES_FOLDER/Root/lib/gio/modules"
+    LD_PATH="$SCRIPT_PATH/$DEPENDENCIES_FOLDER/Root/lib:$SCRIPT_PATH/$BUILD_FOLDER/Release/bin"
+    GIO_DIR="$SCRIPT_PATH/$DEPENDENCIES_FOLDER/Root/lib/gio/modules"
     BUNDLE_DIR="$SCRIPT_PATH/$BUILD_FOLDER/Release/lib"
     MINIBROWSER="$SCRIPT_PATH/$BUILD_FOLDER/Release/bin/MiniBrowser"
   else