Skip to content

F
Front-End
Unverified Commit c2409797 authored by Yegor's avatar Yegor Committed by GitHub
Browse files
Options

Roll chrome 96 attempt 2 (#100073) 

* [web] roll Chromium dep to 96.2

Roll Chromium 96.2.

This is the second attempt to roll it. The previous attempt
(https://github.com/flutter/flutter/pull/99725) failed due to a LUCI
cache issue.

* cache-bust CIPD dependency by changing its name
* specify chrome_and_driver version in canvaskit tests
* fix CRC corruption in kTransparentImage
parent decaa4cb
Show whitespace changes
Inline Side-by-side
Showing with 88 additions and 91 deletions
.ci.yaml
View file @ c2409797
...@@ -17,7 +17,7 @@ platform_properties: ...@@ -17,7 +17,7 @@ platform_properties:
[ [
{"name":"builder_linux_framework","path":"builder"}, {"name":"builder_linux_framework","path":"builder"},
{"name":"android_sdk","path":"android"}, {"name":"android_sdk","path":"android"},
{"name":"chrome_and_driver","path":"chrome"}, {"name":"chrome_and_driver_96","path":"chrome"},
{"name":"flutter_sdk","path":"flutter sdk"}, {"name":"flutter_sdk","path":"flutter sdk"},
{"name":"openjdk","path":"java"}, {"name":"openjdk","path":"java"},
{"name":"pub_cache","path":".pub-cache"} {"name":"pub_cache","path":".pub-cache"}
...@@ -34,7 +34,7 @@ platform_properties: ...@@ -34,7 +34,7 @@ platform_properties:
[ [
{"name":"builder_linux_devicelab","path":"builder"}, {"name":"builder_linux_devicelab","path":"builder"},
{"name":"android_sdk","path":"android"}, {"name":"android_sdk","path":"android"},
{"name":"chrome_and_driver","path":"chrome"}, {"name":"chrome_and_driver_96","path":"chrome"},
{"name":"flutter_sdk","path":"flutter sdk"}, {"name":"flutter_sdk","path":"flutter sdk"},
{"name":"gradle","path":"gradle"}, {"name":"gradle","path":"gradle"},
{"name":"openjdk","path":"java"}, {"name":"openjdk","path":"java"},
...@@ -54,7 +54,7 @@ platform_properties: ...@@ -54,7 +54,7 @@ platform_properties:
[ [
{"name":"builder_linux_devicelab","path":"builder"}, {"name":"builder_linux_devicelab","path":"builder"},
{"name":"android_sdk","path":"android"}, {"name":"android_sdk","path":"android"},
{"name":"chrome_and_driver","path":"chrome"}, {"name":"chrome_and_driver_96","path":"chrome"},
{"name":"flutter_sdk","path":"flutter sdk"}, {"name":"flutter_sdk","path":"flutter sdk"},
{"name":"gradle","path":"gradle"}, {"name":"gradle","path":"gradle"},
{"name":"openjdk","path":"java"}, {"name":"openjdk","path":"java"},
...@@ -74,7 +74,7 @@ platform_properties: ...@@ -74,7 +74,7 @@ platform_properties:
[ [
{"name":"builder_mac_framework","path":"builder"}, {"name":"builder_mac_framework","path":"builder"},
{"name":"android_sdk","path":"android"}, {"name":"android_sdk","path":"android"},
{"name":"chrome_and_driver","path":"chrome"}, {"name":"chrome_and_driver_96","path":"chrome"},
{"name":"flutter_sdk","path":"flutter sdk"}, {"name":"flutter_sdk","path":"flutter sdk"},
{"name":"openjdk","path":"java"}, {"name":"openjdk","path":"java"},
{"name":"osx_sdk_13a233","path":"osx_sdk"}, {"name":"osx_sdk_13a233","path":"osx_sdk"},
...@@ -93,7 +93,7 @@ platform_properties: ...@@ -93,7 +93,7 @@ platform_properties:
[ [
{"name":"builder_mac_devicelab","path":"builder"}, {"name":"builder_mac_devicelab","path":"builder"},
{"name":"android_sdk","path":"android"}, {"name":"android_sdk","path":"android"},
{"name":"chrome_and_driver","path":"chrome"}, {"name":"chrome_and_driver_96","path":"chrome"},
{"name":"flutter_sdk","path":"flutter sdk"}, {"name":"flutter_sdk","path":"flutter sdk"},
{"name":"gradle","path":"gradle"}, {"name":"gradle","path":"gradle"},
{"name":"openjdk","path":"java"}, {"name":"openjdk","path":"java"},
...@@ -112,7 +112,7 @@ platform_properties: ...@@ -112,7 +112,7 @@ platform_properties:
caches: >- caches: >-
[ [
{"name":"builder_mac_devicelab","path":"builder"}, {"name":"builder_mac_devicelab","path":"builder"},
{"name":"chrome_and_driver","path":"chrome"}, {"name":"chrome_and_driver_96","path":"chrome"},
{"name":"flutter_sdk","path":"flutter sdk"}, {"name":"flutter_sdk","path":"flutter sdk"},
{"name":"gradle","path":"gradle"}, {"name":"gradle","path":"gradle"},
{"name":"openjdk","path":"java"}, {"name":"openjdk","path":"java"},
...@@ -135,7 +135,7 @@ platform_properties: ...@@ -135,7 +135,7 @@ platform_properties:
[ [
{"name":"builder_win_framework","path":"builder"}, {"name":"builder_win_framework","path":"builder"},
{"name":"android_sdk","path":"android"}, {"name":"android_sdk","path":"android"},
{"name":"chrome_and_driver","path":"chrome"}, {"name":"chrome_and_driver_96","path":"chrome"},
{"name":"flutter_sdk","path":"flutter sdk"}, {"name":"flutter_sdk","path":"flutter sdk"},
{"name":"openjdk","path":"java"}, {"name":"openjdk","path":"java"},
{"name":"pub_cache","path":".pub-cache"}, {"name":"pub_cache","path":".pub-cache"},
...@@ -153,7 +153,7 @@ platform_properties: ...@@ -153,7 +153,7 @@ platform_properties:
[ [
{"name":"builder_win_devicelab","path":"builder"}, {"name":"builder_win_devicelab","path":"builder"},
{"name":"android_sdk","path":"android"}, {"name":"android_sdk","path":"android"},
{"name":"chrome_and_driver","path":"chrome"}, {"name":"chrome_and_driver_96","path":"chrome"},
{"name":"flutter_sdk","path":"flutter sdk"}, {"name":"flutter_sdk","path":"flutter sdk"},
{"name":"gradle","path":"gradle"}, {"name":"gradle","path":"gradle"},
{"name":"openjdk","path":"java"}, {"name":"openjdk","path":"java"},
...@@ -163,7 +163,7 @@ platform_properties: ...@@ -163,7 +163,7 @@ platform_properties:
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "certs"}, {"dependency": "certs"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
os: Windows-10 os: Windows-10
...@@ -192,7 +192,7 @@ targets: ...@@ -192,7 +192,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:96.2"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -211,7 +211,7 @@ targets: ...@@ -211,7 +211,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "clang"}, {"dependency": "clang"},
...@@ -231,7 +231,7 @@ targets: ...@@ -231,7 +231,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "clang"}, {"dependency": "clang"},
...@@ -462,7 +462,7 @@ targets: ...@@ -462,7 +462,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:96.2"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -484,7 +484,7 @@ targets: ...@@ -484,7 +484,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:96.2"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -506,7 +506,7 @@ targets: ...@@ -506,7 +506,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:96.2"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -528,7 +528,7 @@ targets: ...@@ -528,7 +528,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:96.2"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -550,7 +550,7 @@ targets: ...@@ -550,7 +550,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:96.2"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -572,7 +572,7 @@ targets: ...@@ -572,7 +572,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:96.2"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -595,7 +595,7 @@ targets: ...@@ -595,7 +595,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:96.2"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -618,7 +618,7 @@ targets: ...@@ -618,7 +618,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:96.2"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -641,7 +641,7 @@ targets: ...@@ -641,7 +641,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:96.2"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -664,7 +664,7 @@ targets: ...@@ -664,7 +664,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:96.2"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -707,7 +707,7 @@ targets: ...@@ -707,7 +707,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:96.2"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -734,7 +734,7 @@ targets: ...@@ -734,7 +734,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "clang"}, {"dependency": "clang"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
...@@ -759,7 +759,7 @@ targets: ...@@ -759,7 +759,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "clang"}, {"dependency": "clang"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
...@@ -784,7 +784,7 @@ targets: ...@@ -784,7 +784,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "clang"}, {"dependency": "clang"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
...@@ -809,7 +809,7 @@ targets: ...@@ -809,7 +809,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "clang"}, {"dependency": "clang"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
...@@ -880,7 +880,7 @@ targets: ...@@ -880,7 +880,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:96.2"}
] ]
tags: > tags: >
["devicelab","hostonly"] ["devicelab","hostonly"]
...@@ -898,7 +898,7 @@ targets: ...@@ -898,7 +898,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:96.2"}
] ]
tags: > tags: >
["devicelab"] ["devicelab"]
...@@ -916,7 +916,7 @@ targets: ...@@ -916,7 +916,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_long_running_tests shard: web_long_running_tests
...@@ -937,7 +937,7 @@ targets: ...@@ -937,7 +937,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_long_running_tests shard: web_long_running_tests
...@@ -958,7 +958,7 @@ targets: ...@@ -958,7 +958,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_long_running_tests shard: web_long_running_tests
...@@ -979,7 +979,7 @@ targets: ...@@ -979,7 +979,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_long_running_tests shard: web_long_running_tests
...@@ -1000,7 +1000,7 @@ targets: ...@@ -1000,7 +1000,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_long_running_tests shard: web_long_running_tests
...@@ -1021,7 +1021,7 @@ targets: ...@@ -1021,7 +1021,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_tests shard: web_tests
...@@ -1042,7 +1042,7 @@ targets: ...@@ -1042,7 +1042,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_tests shard: web_tests
...@@ -1063,7 +1063,7 @@ targets: ...@@ -1063,7 +1063,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_tests shard: web_tests
...@@ -1084,7 +1084,7 @@ targets: ...@@ -1084,7 +1084,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_tests shard: web_tests
...@@ -1105,7 +1105,7 @@ targets: ...@@ -1105,7 +1105,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_tests shard: web_tests
...@@ -1126,7 +1126,7 @@ targets: ...@@ -1126,7 +1126,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_tests shard: web_tests
...@@ -1147,7 +1147,7 @@ targets: ...@@ -1147,7 +1147,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_tests shard: web_tests
...@@ -1168,7 +1168,7 @@ targets: ...@@ -1168,7 +1168,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_tests shard: web_tests
...@@ -1189,7 +1189,7 @@ targets: ...@@ -1189,7 +1189,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_canvaskit_tests shard: web_canvaskit_tests
...@@ -1209,7 +1209,7 @@ targets: ...@@ -1209,7 +1209,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_canvaskit_tests shard: web_canvaskit_tests
...@@ -1229,7 +1229,7 @@ targets: ...@@ -1229,7 +1229,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_canvaskit_tests shard: web_canvaskit_tests
...@@ -1249,7 +1249,7 @@ targets: ...@@ -1249,7 +1249,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_canvaskit_tests shard: web_canvaskit_tests
...@@ -1269,7 +1269,7 @@ targets: ...@@ -1269,7 +1269,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_canvaskit_tests shard: web_canvaskit_tests
...@@ -1289,7 +1289,7 @@ targets: ...@@ -1289,7 +1289,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_canvaskit_tests shard: web_canvaskit_tests
...@@ -1309,7 +1309,7 @@ targets: ...@@ -1309,7 +1309,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_canvaskit_tests shard: web_canvaskit_tests
...@@ -1329,7 +1329,7 @@ targets: ...@@ -1329,7 +1329,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
shard: web_canvaskit_tests shard: web_canvaskit_tests
...@@ -1349,7 +1349,7 @@ targets: ...@@ -1349,7 +1349,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
...@@ -3720,7 +3720,7 @@ targets: ...@@ -3720,7 +3720,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
tags: > tags: >
...@@ -3741,7 +3741,7 @@ targets: ...@@ -3741,7 +3741,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
...@@ -3760,7 +3760,7 @@ targets: ...@@ -3760,7 +3760,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
...@@ -3779,7 +3779,7 @@ targets: ...@@ -3779,7 +3779,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
...@@ -3893,7 +3893,7 @@ targets: ...@@ -3893,7 +3893,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
tags: > tags: >
...@@ -3917,7 +3917,7 @@ targets: ...@@ -3917,7 +3917,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
tags: > tags: >
...@@ -3951,7 +3951,7 @@ targets: ...@@ -3951,7 +3951,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
tags: > tags: >
...@@ -3975,7 +3975,7 @@ targets: ...@@ -3975,7 +3975,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
tags: > tags: >
...@@ -4000,7 +4000,7 @@ targets: ...@@ -4000,7 +4000,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
tags: > tags: >
...@@ -4024,7 +4024,7 @@ targets: ...@@ -4024,7 +4024,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
tags: > tags: >
...@@ -4048,7 +4048,7 @@ targets: ...@@ -4048,7 +4048,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
tags: > tags: >
...@@ -4069,7 +4069,7 @@ targets: ...@@ -4069,7 +4069,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
...@@ -4094,7 +4094,7 @@ targets: ...@@ -4094,7 +4094,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
...@@ -4119,7 +4119,7 @@ targets: ...@@ -4119,7 +4119,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
...@@ -4144,7 +4144,7 @@ targets: ...@@ -4144,7 +4144,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
...@@ -4169,7 +4169,7 @@ targets: ...@@ -4169,7 +4169,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
...@@ -4194,7 +4194,7 @@ targets: ...@@ -4194,7 +4194,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
...@@ -4260,7 +4260,7 @@ targets: ...@@ -4260,7 +4260,7 @@ targets:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
......
examples/hello_world/test_driver/smoke_web_engine_test.dart
View file @ c2409797
...@@ -38,25 +38,11 @@ void main() { ...@@ -38,25 +38,11 @@ void main() {
// TODO(ianh): this delay violates our style guide. We should instead wait for a triggering event. // TODO(ianh): this delay violates our style guide. We should instead wait for a triggering event.
await Future<void>.delayed(const Duration(seconds: 2)); await Future<void>.delayed(const Duration(seconds: 2));
// A flutter web app may be rendered directly on the body of the page, or final WebElement? fltSemantics = await driver.webDriver.execute(
// inside the shadow root of the flt-glass-pane (after Flutter 2.4). To 'return document.querySelector("flt-glass-pane")?.shadowRoot.querySelector("flt-semantics")',
// make this test backwards compatible, we first need to locate the correct
// root for the app.
//
// It's either the shadowRoot within flt-glass-pane, or [driver.webDriver].
final SearchContext appRoot = await driver.webDriver.execute(
'return document.querySelector("flt-glass-pane")?.shadowRoot;',
<dynamic>[], <dynamic>[],
) as SearchContext? ?? driver.webDriver; ) as WebElement?;
expect(fltSemantics, isNotNull);
// Elements with tag "flt-semantics" would show up after enabling
// accessibility.
//
// The tag used here is based on
// https://github.com/flutter/engine/blob/master/lib/web_ui/lib/src/engine/semantics/semantics.dart#L534
final WebElement element = await appRoot.findElement(const By.cssSelector('flt-semantics'));
expect(element, isNotNull);
}); });
}); });
} }
packages/flutter/test/cupertino/dialog_test.dart
View file @ c2409797
...@@ -10,6 +10,7 @@ import 'dart:math'; ...@@ -10,6 +10,7 @@ import 'dart:math';
import 'dart:ui'; import 'dart:ui';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
...@@ -324,7 +325,12 @@ void main() { ...@@ -324,7 +325,12 @@ void main() {
// Visually the "Cancel" button and "OK" button are the same height when using the // Visually the "Cancel" button and "OK" button are the same height when using the
// regular font. However, when using the test font, "Cancel" becomes 2 lines which // regular font. However, when using the test font, "Cancel" becomes 2 lines which
// is why the height we're verifying for "Cancel" is larger than "OK". // is why the height we're verifying for "Cancel" is larger than "OK".
expect(tester.getSize(find.text('The Title')), equals(const Size(270.0, 132.0)));
// TODO(yjbanov): https://github.com/flutter/flutter/issues/99933
// A bug in the HTML renderer and/or Chrome 96+ causes a
// discrepancy in the paragraph height.
const bool hasIssue99933 = kIsWeb && !bool.fromEnvironment('FLUTTER_WEB_USE_SKIA');
expect(tester.getSize(find.text('The Title')), equals(const Size(270.0, hasIssue99933 ? 133 : 132.0)));
expect(tester.getTopLeft(find.text('The Title')), equals(const Offset(265.0, 80.0 + 24.0))); expect(tester.getTopLeft(find.text('The Title')), equals(const Offset(265.0, 80.0 + 24.0)));
expect(tester.getSize(find.widgetWithText(CupertinoDialogAction, 'Cancel')), equals(const Size(310.0, 148.0))); expect(tester.getSize(find.widgetWithText(CupertinoDialogAction, 'Cancel')), equals(const Size(310.0, 148.0)));
expect(tester.getSize(find.widgetWithText(CupertinoDialogAction, 'OK')), equals(const Size(310.0, 98.0))); expect(tester.getSize(find.widgetWithText(CupertinoDialogAction, 'OK')), equals(const Size(310.0, 98.0)));
......
packages/flutter/test/image_data.dart
View file @ c2409797
...@@ -19,9 +19,14 @@ const List<int> kBlueSquarePng = <int>[ ...@@ -19,9 +19,14 @@ const List<int> kBlueSquarePng = <int>[
const List<int> kTransparentImage = <int>[ const List<int> kTransparentImage = <int>[
0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D, 0x49, 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D, 0x49,
0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x08, 0x06, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x08, 0x06,
0x00, 0x00, 0x00, 0x1F, 0x15, 0xC4, 0x89, 0x00, 0x00, 0x00, 0x0A, 0x49, 0x44, 0x00, 0x00, 0x00, 0x1F, 0x15, 0xC4, 0x89, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4B,
0x41, 0x54, 0x78, 0x9C, 0x63, 0x00, 0x01, 0x00, 0x00, 0x05, 0x00, 0x01, 0x0D, 0x47, 0x44, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0xA0, 0xBD, 0xA7, 0x93, 0x00,
0x0A, 0x2D, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00,
0x0B, 0x13, 0x01, 0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49,
0x4D, 0x45, 0x07, 0xE6, 0x03, 0x10, 0x17, 0x07, 0x1D, 0x2E, 0x5E, 0x30, 0x9B,
0x00, 0x00, 0x00, 0x0B, 0x49, 0x44, 0x41, 0x54, 0x08, 0xD7, 0x63, 0x60, 0x00,
0x02, 0x00, 0x00, 0x05, 0x00, 0x01, 0xE2, 0x26, 0x05, 0x9B, 0x00, 0x00, 0x00,
0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82,
]; ];
/// An animated GIF image with 3 1x1 pixel frames (a red, green, and blue /// An animated GIF image with 3 1x1 pixel frames (a red, green, and blue
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab