Merge branch 'particularly_complex_cache_entry' of https://github.com…

…/ColdPaleLight/engine into particularly_complex_cache_entry

DEPS

@@ -27,7 +27,7 @@ vars = {
   'skia_git': 'https://skia.googlesource.com',
   # OCMock is for testing only so there is no google clone
   'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
-  'skia_revision': 'f029354f16cffcdbc7c6e6bd308a9e102849cb46',
+  'skia_revision': '0843ef6ded083754b203886d056d4351aa70a5b0',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -39,7 +39,7 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS.
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '5422228147cd8bf4b92ec2404b15e52520ed9943',
+  'dart_revision': '4fbe27c0f148c915ceb2f6bd615a7d79114730e0',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -60,7 +60,7 @@ vars = {
   'dart_webkit_inspection_protocol_rev': 'dd6fb5d8b536e19cedb384d0bbf1f5631923f1e8',
   'dart_yaml_edit_rev': 'df1452bfe1653286277a1a8f34dddf3e4fbedd9e',
 
-  'ocmock_tag': 'v3.7.1',
+  'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
 
   # Download a prebuilt Dart SDK by default
   'download_dart_sdk': True,
@@ -381,7 +381,7 @@ deps = {
    Var('skia_git') + '/skia.git' + '@' +  Var('skia_revision'),
 
   'src/third_party/ocmock':
-   Var('ocmock_git') + '@' +  Var('ocmock_tag'),
+   Var('ocmock_git') + '@' +  Var('ocmock_rev'),
 
   'src/third_party/libjpeg-turbo':
    Var('fuchsia_git') + '/third_party/libjpeg-turbo' + '@' + '0fb821f3b2e570b2783a94ccd9a2fb1f4916ae9f',
@@ -390,7 +390,7 @@ deps = {
    Var('flutter_git') + '/third_party/libpng' + '@' + '45c760458b4a83d567cc42d21bd79a3b3fe21815',
 
   'src/third_party/libwebp':
-   Var('chromium_git') + '/webm/libwebp.git' + '@' + '1.2.0',
+   Var('chromium_git') + '/webm/libwebp.git' + '@' + '7dfde712a477e420968732161539011e0fd446cf', # 1.2.0
 
   'src/third_party/wuffs':
    Var('skia_git') + '/external/github.com/google/wuffs-mirror-release-c.git' + '@' + '600cd96cf47788ee3a74b40a6028b035c9fd6a61',
@@ -421,7 +421,7 @@ deps = {
 
    # Upstream Khronos Vulkan Headers (v1.1.130)
    'src/third_party/vulkan-headers':
-   Var('github_git') + '/KhronosGroup/Vulkan-Headers.git' + '@' + 'v1.1.130',
+   Var('github_git') + '/KhronosGroup/Vulkan-Headers.git' + '@' + '0e57fc1cfa56a203efe43e4dfb9b3c9e9b105593',
 
    # Downstream Fuchsia Vulkan Headers (v1.2.198)
   'src/third_party/fuchsia-vulkan':
@@ -441,7 +441,7 @@ deps = {
 
    # Dart packages
   'src/third_party/pkg/archive':
-  Var('github_git') + '/brendan-duncan/archive.git' + '@' + '3.1.2',
+  Var('github_git') + '/brendan-duncan/archive.git' + '@' + '9de7a0544457c6aba755ccb65abb41b0dc1db70d', # 3.1.2
 
   'src/third_party/pkg/equatable':
   Var('github_git') + '/felangel/equatable.git' + '@' + '0ba67c72db8bed75877fc1caafa74112ee0bd921', # 2.0.2
@@ -471,7 +471,7 @@ deps = {
   Var('github_git') + '/google/quiver-dart.git' + '@' + '66f473cca1332496e34a783ba4527b04388fd561', # 2.1.5
 
   'src/third_party/pkg/vector_math':
-  Var('github_git') + '/google/vector_math.dart.git' + '@' + 'v2.1.0',
+  Var('github_git') + '/google/vector_math.dart.git' + '@' + '0a5fd95449083d404df9768bc1b321b88a7d2eef', # 2.1.0
 
   'src/third_party/imgui':
   Var('github_git') + '/ocornut/imgui.git' + '@' + '29d462ebce0275345a6ce4621d8fff0ded57c9e5',
@@ -607,7 +607,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'IHhPR4wYbe6nV9mZPTTLPY-6v9hkh4LxkeCPzoN1RdIC'
+        'version': 'fewd4Sjq-esVX5XMhFgqwnEbsqzssXF_T9BefRXxTmAC'
        }
      ],
      'condition': 'host_os == "mac" and not download_fuchsia_sdk',
@@ -617,7 +617,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'p4GalDfujoAJNjreQUux9be5D63v4YrORCfbJdzx8Q4C'
+        'version': 'mdWVfIuK8cJ9sce3AQK1HuytT8opPyJdeLwSx-6bmWgC'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',

ci/licenses_golden/licenses_flutter

@@ -1093,6 +1093,8 @@ FILE: ../../../flutter/shell/gpu/gpu_surface_vulkan.h
 FILE: ../../../flutter/shell/gpu/gpu_surface_vulkan_delegate.cc
 FILE: ../../../flutter/shell/gpu/gpu_surface_vulkan_delegate.h
 FILE: ../../../flutter/shell/platform/android/AndroidManifest.xml
+FILE: ../../../flutter/shell/platform/android/android_choreographer.cc
+FILE: ../../../flutter/shell/platform/android/android_choreographer.h
 FILE: ../../../flutter/shell/platform/android/android_context_gl.cc
 FILE: ../../../flutter/shell/platform/android/android_context_gl.h
 FILE: ../../../flutter/shell/platform/android/android_context_gl_unittests.cc

ci/licenses_golden/licenses_fuchsia

@@ -1,4 +1,4 @@
-Signature: 713a262461ad452d0d8fc4237b78c696
+Signature: 84cae058ddaee903330d1c0ead0b37fd
 
 UNUSED LICENSES:
 
@@ -458,6 +458,7 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsysteminfo/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castwindow/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.cobalt/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/meta.json
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.resolution/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.runner/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.test/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.types/meta.json
@@ -1203,6 +1204,7 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsysteminfo/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castwindow/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.cobalt/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/meta.json
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.resolution/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.runner/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.test/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.types/meta.json
@@ -1845,6 +1847,7 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castsysteminfo/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.castwindow/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.cobalt/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.decl/meta.json
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.resolution/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.runner/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.test/meta.json
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.types/meta.json
@@ -3653,8 +3656,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: fuchsia_sdk
-ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/connector.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.resolution/component.fidl + ../../../fuchsia/sdk/linux/LICENSE
 TYPE: LicenseType.bsd
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.resolution/component.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.resolution/package.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.component.resolution/resolver.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.audio.signalprocessing/connector.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.power.clientlevel/clientlevel.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.power.systemmode/systemmode.fidl

ci/licenses_golden/licenses_skia

@@ -1,4 +1,4 @@
-Signature: beedd4e737da61881819e38818182c12
+Signature: 0653f22c99b7de312f9c875856b196ce
 
 UNUSED LICENSES:
 
@@ -652,16 +652,6 @@ FILE: ../../../third_party/skia/CQ_COMMITTERS
 FILE: ../../../third_party/skia/DEPS
 FILE: ../../../third_party/skia/DIR_METADATA
 FILE: ../../../third_party/skia/WORKSPACE.bazel
-FILE: ../../../third_party/skia/animations/checkbox.xml
-FILE: ../../../third_party/skia/animations/chest#1.jpg
-FILE: ../../../third_party/skia/animations/fire#1.jpg
-FILE: ../../../third_party/skia/animations/images#1.xml
-FILE: ../../../third_party/skia/animations/jet#1.jpg
-FILE: ../../../third_party/skia/animations/lines#1.xml
-FILE: ../../../third_party/skia/animations/movie#1.xml
-FILE: ../../../third_party/skia/animations/paths#1.xml
-FILE: ../../../third_party/skia/animations/redcross#1.jpg
-FILE: ../../../third_party/skia/animations/text#1.xml
 FILE: ../../../third_party/skia/bazel/BUILD.bazel
 FILE: ../../../third_party/skia/bazel/cc_binary_with_flags.bzl
 FILE: ../../../third_party/skia/bazel/common_config_settings/BUILD.bazel
@@ -803,6 +793,7 @@ FILE: ../../../third_party/skia/include/private/BUILD.bazel
 FILE: ../../../third_party/skia/include/private/chromium/BUILD.bazel
 FILE: ../../../third_party/skia/include/sksl/BUILD.bazel
 FILE: ../../../third_party/skia/include/svg/BUILD.bazel
+FILE: ../../../third_party/skia/include/third_party/BUILD.bazel
 FILE: ../../../third_party/skia/include/utils/BUILD.bazel
 FILE: ../../../third_party/skia/include/utils/mac/BUILD.bazel
 FILE: ../../../third_party/skia/infra/bots/BUILD.bazel
@@ -1910,7 +1901,6 @@ FILE: ../../../third_party/skia/bench/StreamBench.cpp
 FILE: ../../../third_party/skia/bench/SwizzleBench.cpp
 FILE: ../../../third_party/skia/bench/TileImageFilterBench.cpp
 FILE: ../../../third_party/skia/bench/VertexColorSpaceBench.cpp
-FILE: ../../../third_party/skia/experimental/xps_to_png/xps_to_png.cs
 FILE: ../../../third_party/skia/fuzz/Fuzz.cpp
 FILE: ../../../third_party/skia/fuzz/Fuzz.h
 FILE: ../../../third_party/skia/fuzz/FuzzGradients.cpp
@@ -3266,7 +3256,7 @@ FILE: ../../../third_party/skia/src/effects/imagefilters/SkComposeImageFilter.cp
 FILE: ../../../third_party/skia/src/effects/imagefilters/SkDisplacementMapImageFilter.cpp
 FILE: ../../../third_party/skia/src/effects/imagefilters/SkDropShadowImageFilter.cpp
 FILE: ../../../third_party/skia/src/effects/imagefilters/SkTileImageFilter.cpp
-FILE: ../../../third_party/skia/src/gpu/GrBlend.h
+FILE: ../../../third_party/skia/src/gpu/Blend.h
 FILE: ../../../third_party/skia/src/gpu/GrCaps.h
 FILE: ../../../third_party/skia/src/gpu/GrGeometryProcessor.h
 FILE: ../../../third_party/skia/src/gpu/GrPaint.cpp
@@ -3465,7 +3455,6 @@ FILE: ../../../third_party/skia/bench/PathOpsBench.cpp
 FILE: ../../../third_party/skia/bench/PolyUtilsBench.cpp
 FILE: ../../../third_party/skia/bench/ShaderMaskFilterBench.cpp
 FILE: ../../../third_party/skia/bench/TypefaceBench.cpp
-FILE: ../../../third_party/skia/experimental/pvg/draw_msg.proto
 FILE: ../../../third_party/skia/fuzz/FuzzCommon.cpp
 FILE: ../../../third_party/skia/fuzz/FuzzPathMeasure.cpp
 FILE: ../../../third_party/skia/fuzz/FuzzRegionOp.cpp
@@ -4203,21 +4192,6 @@ TYPE: LicenseType.bsd
 FILE: ../../../third_party/skia/bench/FindCubicConvex180ChopsBench.cpp
 FILE: ../../../third_party/skia/bench/GlyphQuadFillBench.cpp
 FILE: ../../../third_party/skia/bench/TessellateBench.cpp
-FILE: ../../../third_party/skia/experimental/skrive/include/SkRive.h
-FILE: ../../../third_party/skia/experimental/skrive/src/Artboard.cpp
-FILE: ../../../third_party/skia/experimental/skrive/src/Color.cpp
-FILE: ../../../third_party/skia/experimental/skrive/src/Component.cpp
-FILE: ../../../third_party/skia/experimental/skrive/src/Drawable.cpp
-FILE: ../../../third_party/skia/experimental/skrive/src/Ellipse.cpp
-FILE: ../../../third_party/skia/experimental/skrive/src/Node.cpp
-FILE: ../../../third_party/skia/experimental/skrive/src/Paint.cpp
-FILE: ../../../third_party/skia/experimental/skrive/src/Rectangle.cpp
-FILE: ../../../third_party/skia/experimental/skrive/src/Shape.cpp
-FILE: ../../../third_party/skia/experimental/skrive/src/SkRive.cpp
-FILE: ../../../third_party/skia/experimental/skrive/src/reader/BinaryReader.cpp
-FILE: ../../../third_party/skia/experimental/skrive/src/reader/JsonReader.cpp
-FILE: ../../../third_party/skia/experimental/skrive/src/reader/StreamReader.cpp
-FILE: ../../../third_party/skia/experimental/skrive/src/reader/StreamReader.h
 FILE: ../../../third_party/skia/fuzz/FuzzSkParagraph.cpp
 FILE: ../../../third_party/skia/gm/3d.cpp
 FILE: ../../../third_party/skia/gm/bc1_transparency.cpp
@@ -6134,6 +6108,8 @@ FILE: ../../../third_party/skia/src/core/SkKeyHelpers.cpp
 FILE: ../../../third_party/skia/src/core/SkKeyHelpers.h
 FILE: ../../../third_party/skia/src/core/SkPaintParamsKey.cpp
 FILE: ../../../third_party/skia/src/core/SkPaintParamsKey.h
+FILE: ../../../third_party/skia/src/core/SkPipelineData.cpp
+FILE: ../../../third_party/skia/src/core/SkPipelineData.h
 FILE: ../../../third_party/skia/src/core/SkSLTypeShared.h
 FILE: ../../../third_party/skia/src/core/SkShaderCodeDictionary.cpp
 FILE: ../../../third_party/skia/src/core/SkShaderCodeDictionary.h

ci/licenses_golden/licenses_third_party

@@ -1,4 +1,4 @@
-Signature: c1717bcb576f9eeb9d5b1018c4ce51b4
+Signature: d273b6719c27e2c96c5a2a52ecc4ea83
 
 UNUSED LICENSES:
 

lib/ui/window.dart

@@ -771,6 +771,7 @@ class AccessibilityFeatures {
   static const int _kBoldTextIndex = 1 << 3;
   static const int _kReduceMotionIndex = 1 << 4;
   static const int _kHighContrastIndex = 1 << 5;
+  static const int _kOnOffSwitchLabelsIndex = 1 << 6;
 
   // A bitfield which represents each enabled feature.
   final int _index;
@@ -803,6 +804,11 @@ class AccessibilityFeatures {
   /// Only supported on iOS.
   bool get highContrast => _kHighContrastIndex & _index != 0;
 
+  /// The platform is requesting to show on/off labels inside switches.
+  ///
+  /// Only supported on iOS.
+  bool get onOffSwitchLabels => _kOnOffSwitchLabelsIndex & _index != 0;
+
   @override
   String toString() {
     final List<String> features = <String>[];
@@ -818,6 +824,8 @@ class AccessibilityFeatures {
       features.add('reduceMotion');
     if (highContrast)
       features.add('highContrast');
+    if (onOffSwitchLabels)
+      features.add('onOffSwitchLabels');
     return 'AccessibilityFeatures$features';
   }
 

lib/ui/window/platform_configuration.h

@@ -35,6 +35,7 @@ enum class AccessibilityFeatureFlag : int32_t {
   kBoldText = 1 << 3,
   kReduceMotion = 1 << 4,
   kHighContrast = 1 << 5,
+  kOnOffSwitchLabels = 1 << 6,
 };
 
 //--------------------------------------------------------------------------

lib/web_ui/README.md

@@ -135,8 +135,54 @@ When running tests on LUCI using Chromium, LUCI uses the version of Chromium
 fetched from CIPD.
 
 Since the engine code and infra recipes do not live in the same repository
-there are few steps to follow in order to upgrade a browser's version. For
-now these instructins are most relevant to Chrome.
+there are few steps to follow in order to upgrade a browser's version.
+
+#### Chromium
+
+Chromium is an independent project that gets rolled into Flutter manually, and as needed.
+Flutter consumes a pre-built Chromium version from chromium.org. When a new version of
+Chromium (check [here](https://www.chromium.org/getting-involved/download-chromium/#downloading-old-builds-of-chrome-chromium))
+is needed, follow these steps to roll the new version:
+
+- Make sure you have `depot_tools` installed (if you are regularly hacking on
+  the engine code, you probably do).
+- If not already authenticated with CIPD, run `cipd auth-login` and follow
+  instructions (this step requires sufficient privileges; contact
+  #hackers-infra-🌡 on [Flutter's Discord server](https://github.com/flutter/flutter/wiki/Chat)).
+- Edit `dev/browser_lock.yaml` and update the following values under `chrome`:
+  - Set `Windows`, `Mac` and `Linux` to the `branch_base_position`s given [in this table](https://omahaproxy.appspot.com).
+  (Pick from `linux`, `mac` and `win` as `os`, and the `stable` channel.)
+  - Set `version` to a string composed of the Major Version of the browser, and
+  the number of times that major version has been uploaded to CIPD. For example,
+  start with `'99'` for version 99.0.4844.51 of Chromium, and update to `'99.1'`,
+  `'99.2'` and so on if you need to upload newer bundles of the same major version.
+  (This is required because tags can't be repeated in CIPD).
+- Run `dart dev/browser_roller.dart` and make sure it completes successfully.
+  The script uploads the specified versions of Chromium (and Chromedriver) to the
+  right locations in CIPD: [Chrome](https://chrome-infra-packages.appspot.com/p/flutter_internal/browsers/chrome),
+  [Chromedriver](https://chrome-infra-packages.appspot.com/p/flutter_internal/browser-drivers/chrome).
+- Send a pull request containing the above file changes. Newer versions of Chromium
+  might break some tests or Goldens. Get those fixed too!
+
+If you have questions, contact the Flutter Web team on Flutter Discord on the
+\#hackers-web-🌍 channel.
+
+##### **browser_roller.dart**
+
+The script has the following command-line options:
+
+- `--dry-run` - The script will stop before uploading artifacts to CIPD. The location of the data will be reported at the end of the script, if the script finishes successfullyThe output of the script will be visible in /tmp/browser-roll-RANDOM_STRING
+- `--verbose` - Greatly increase the amount of information printed to `stdout` by the script.
+
+> Try the following!
+>
+> ```bash
+> dart ./dev/browser_roller.dart --dry-run --verbose
+> ```
+
+#### **Other browsers / manual upload**
+
+In general, the manual process goes like this:
 
 1. Dowload the binaries for the new browser/driver for each operaing system
    (macOS, linux, windows).
@@ -147,11 +193,10 @@ now these instructins are most relevant to Chrome.
 
 Resources:
 
-1. For Chrome downloads [link][3].
-2. Browser and driver CIPD [packages][4] (required speciall access; ping
+1. Browser and driver CIPD [packages][4] (requires special access; ping
    hackers-infra on Discord for more information)
-3. LUCI web [recipe][5]
-4. More general reading on CIPD packages [link][6]
+2. LUCI web [recipe][5]
+3. More general reading on CIPD packages [link][6]
 
 ### Rolling CanvasKit
 
@@ -222,7 +267,6 @@ FELT_USE_SNAPSHOT=false felt <command>
 
 [1]: https://github.com/flutter/flutter/wiki/Setting-up-the-Engine-development-environment
 [2]: https://github.com/flutter/engine/blob/main/lib/web_ui/dev/browser_lock.yaml
-[3]: https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html
 [4]: https://chrome-infra-packages.appspot.com/p/flutter_internal
-[5]: https://flutter.googlesource.com/recipes/+/refs/heads/main/recipes/web_engine.py
+[5]: https://cs.opensource.google/flutter/recipes/+/master:recipes/engine/web_engine.py
 [6]: https://chromium.googlesource.com/chromium/src.git/+/main/docs/cipd_and_3pp.md#What-is-CIPD

lib/web_ui/dev/browser_lock.dart

@@ -40,13 +40,16 @@ class ChromeLock {
   ChromeLock._fromYaml(YamlMap yaml) :
     linux = (yaml['Linux'] as int).toString(),
     mac = (yaml['Mac'] as int).toString(),
-    windows = (yaml['Win'] as int).toString();
+    windows = (yaml['Win'] as int).toString(),
+    version = yaml['version'] as String;
 
   final String linux;
   final String mac;
   final String windows;
+  /// The major version of Chromium represented by this lock. E.g: '96' (for Chromium 96.0.554.51)
+  final String version;
 
-  /// Return the version of Chromium to use for the current operating system.
+  /// Return the Chromium Build ID to use for the current operating system.
   String get versionForCurrentPlatform {
     return PlatformBinding.instance.getChromeBuild(this);
   }