Bump to Chrome 111. (flutter#39525)

0xZOne · Feb 20, 2023 · 0fe2f15 · 0fe2f15
1 parent a249c9b
commit 0fe2f15
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/.ci.yaml b/.ci.yaml
@@ -285,7 +285,7 @@ targets:
         {"download_emsdk": true}
       dependencies: >-
         [
-          {"dependency": "chrome_and_driver", "version": "version:110.0"},
+          {"dependency": "chrome_and_driver", "version": "version:111.0"},
           {"dependency": "firefox", "version": "version:106.0"},
           {"dependency": "goldctl", "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"}
         ]
@@ -310,7 +310,7 @@ targets:
         {"download_emsdk": true}
       dependencies: >-
         [
-          {"dependency": "chrome_and_driver", "version": "version:96.2"},
+          {"dependency": "chrome_and_driver", "version": "version:111.0"},
           {"dependency": "curl", "version": "version:7.64.0"}
         ]
       framework: "true"
@@ -525,7 +525,7 @@ targets:
       gcs_goldens_bucket: flutter_logs
       dependencies: >-
         [
-          {"dependency": "chrome_and_driver", "version": "version:110.0"}
+          {"dependency": "chrome_and_driver", "version": "version:111.0"}
         ]
     timeout: 60
     runIf:

diff --git a/lib/web_ui/dev/browser_lock.yaml b/lib/web_ui/dev/browser_lock.yaml
@@ -13,11 +13,11 @@ chrome:
   # `self.m.platform.name.capitalize()` evaluates to. See:
   #
   # recipe_modules/web_util/api.py
-  Linux: 1084013
-  Mac: 1084013
-  Mac_Arm: 1084001
-  Win: 1084062
-  version: '110.0' # CIPD tag for the above Build IDs. Normally "ChromeMajorVersion.UploadAttempt". ;)
+  Linux: 1097615
+  Mac: 1097624
+  Mac_Arm: 1097626
+  Win: 1097664
+  version: '111.0' # CIPD tag for the above Build IDs. Normally "ChromeMajorVersion.UploadAttempt". ;)
 
 firefox:
   version: '106.0'

diff --git a/lib/web_ui/dev/chrome.dart b/lib/web_ui/dev/chrome.dart
@@ -112,6 +112,14 @@ class Chrome extends Browser {
         '--disable-default-apps',
         '--disable-translate',
         '--remote-debugging-port=$kDevtoolsPort',
+
+        // SwiftShader support on ARM macs is disabled until they upgrade to a newer
+        // version of LLVM, see https://issuetracker.google.com/issues/165000222. In
+        // headless Chrome, the default is to use SwiftShader as a software renderer
+        // for WebGL contexts. In order to work around this limitation, we can force
+        // GPU rendering with this flag.
+        if (environment.isMacosArm)
+          '--use-angle=metal',
       ];
 
       final Process process =